Commit 662265b9 authored by javi's avatar javi

Merge branch 'master' of

https://gitlab.bsc.es/inb/text-mining/generic-tools/import-json-to-mongo.git

Conflicts:
	src/main/java/es/bsc/inb/importjson/mongo/main/App.java
parents 88ca43ee 2bba787b
Pipeline #6231 passed with stage
in 1 minute and 21 seconds