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

« Previous | Next »

Revision 487e442c

Added by Cherian Mathew almost 9 years ago

ID 487e442c0c7d6f6a114d11cd3a2494f6ea9094f9
Parent 233a8fe2, 3c4d1aba
Child bb1997d0

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

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

Changes

added
modified
copied
renamed
deleted