Project

General

Profile

« Previous | Next » 

Revision 19a8bfe7

ID19a8bfe7b1bc7f737a85baeb4255edb32c79e7fa
Parent 3237a360, 6992befa
Child ea7b7584

Added by Cherian Mathew over 5 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)