Commit 301490df authored by Javi Corvi's avatar Javi Corvi
Browse files

Merge branch 'develop' of

https://gitlab.bsc.es/inb/etransafe/pretox-rest-api.git into develop

Conflicts:
	src/main/java/es/bsc/inb/ades/rest/api/controllers/DocumentController.java
	src/main/resources/application.properties
parents 6af263f0 7b756ea2
Pipeline #25590 passed with stage
in 3 seconds