Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 12 Apr 2016 08:03:42 +0000 (10:03 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 12 Apr 2016 08:03:42 +0000 (10:03 +0200)
commit83e8037496074ec16da9cfbd0c9f19fd70ab375b
treeef4cd74750a96c94c8797c84dc176f8c19978aab
parenta5e2004dcb8e7d06080a79b2bd7c213c076539c9
parent4c646f73b6c6902f3cc9ae7bc19d2a18fc379cef
Merge branch 'develop' into LibrAlign
.gitattributes
eu.etaxonomy.taxeditor.molecular/plugin.xml
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java