From: jenkins <jenkins-int@bgbm.org>
Date: Fri, 11 Sep 2015 12:15:00 +0000 (+0200)
Subject: Merge branch 'release/3.8.0'
X-Git-Tag: 3.8.0
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/98060576787fce54ab247c05e0020a90db973f09

Merge branch 'release/3.8.0'

Conflicts:
	eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.application/pom.xml
	eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.bulkeditor/pom.xml
	eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.cdmlib/pom.xml
	eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.editor/pom.xml
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
	eu.etaxonomy.taxeditor.feature.platform/feature.xml
	eu.etaxonomy.taxeditor.feature.platform/pom.xml
	eu.etaxonomy.taxeditor.feature/feature.xml
	eu.etaxonomy.taxeditor.feature/pom.xml
	eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.help/pom.xml
	eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.navigation/pom.xml
	eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.printpublisher/pom.xml
	eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
	eu.etaxonomy.taxeditor.store/pom.xml
	eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
	eu.etaxonomy.taxeditor/pom.xml
	pom.xml
---

98060576787fce54ab247c05e0020a90db973f09
diff --cc eu.etaxonomy.taxeditor/pom.xml
index fc92919c5,ce1e3905b..090a3d224
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@@ -132,4 -132,4 +132,4 @@@
      </profile>
    </profiles>
  
--</project>
++</project>