Project

General

Profile

« Previous | Next » 

Revision 92afad3d

ID92afad3db69b6b781a67fbc3119d9f843acd1d49
Parent 22eb2e66, b6e8ecc0
Child 8ec912fc

Added by Andreas Müller about 4 years ago

Merge branch 'master' of ssh://dev.e-taxonomy.eu/var/git/cdmlib-apps

Conflicts:
app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDExportActivator.java
app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDImportActivator.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)