Revision 9632d60d - Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-... - EDIT - EDIT Project Management

« Previous | Next »

Revision 9632d60d

Added by Cherian Mathew almost 8 years ago

ID 9632d60d4c0c495662372d4befb1fa40361848a4
Parent 530ba367, c555b209
Child e62f0e9d

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java

Changes

added
modified
copied
renamed
deleted