Commit 552b0161 authored by jcorvi's avatar jcorvi
Browse files

Merge branch 'master' of

https://gitlab.bsc.es/inb/etransafe/ades-export-to-json.git

Conflicts:
	README.md
parents 8bf36fce 20b9f1cb
Pipeline #2746 passed with stage
in 1 minute and 56 seconds