BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 530ba36 c555b20)
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 13:06:40 +0000 (15:06 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 13:06:40 +0000 (15:06 +0200)
Conflicts:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java


Trivial merge