Merge branch 'develop' into derivateView
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 22 May 2017 14:25:51 +0000 (16:25 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 22 May 2017 14:25:51 +0000 (16:25 +0200)
commit75aac13ee0657f4b443b954994318334ec6bb919
treeaf738c5f1c37f3fa82b460be76bd5ac302c57bf3
parentb6f56e18d4705e6f34e9d600b9d13099c51994f0
parent5dba28d34f8a31fc68895ca564a6b52ae3681036
Merge branch 'develop' into derivateView

# Conflicts:
# eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml