Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 24 Oct 2016 07:20:39 +0000 (09:20 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 24 Oct 2016 07:27:25 +0000 (09:27 +0200)
commitc6476daa5094f992b235fd7c4d10c17b90dc0e8b
tree7f6bd6580bc9b415591ddf425d092d27453356bc
parentbc036167b680317859fa9b986a5b817f48b3d8c1
parentbe719c489241a9a9ed181b82338df1cd593ab999
Merge branch 'develop' into LibrAlign

# Conflicts:
# eu.etaxonomy.taxeditor.molecular.lib/.classpath
eu.etaxonomy.taxeditor.molecular.lib/.classpath
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF