Commit 3e2289e3 authored by PECQUOT's avatar PECQUOT
Browse files

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	sumaris-test-shared/src/main/resources/data-hsqldb-06-configs.xml
parents d14baccb 5a6c06ee
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment