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

« Previous | Next »

Revision 19a8bfe7

Added by Cherian Mathew over 8 years ago

ID 19a8bfe7b1bc7f737a85baeb4255edb32c79e7fa
Parent 3237a360, 6992befa
Child ea7b7584

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

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

Changes

added
modified
copied
renamed
deleted