cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
Replace spring application context loading with programmatic loading
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.editor/plugin.xml eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...
change preferences page for taxonnode sort
fixing #5150
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
moving more than one taxon node, merge of team and person, reusing name for new taxon
Avoid exception loop when taxon name is null (#4996)
Trim code
Check for disposed widget
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
View revisions
Also available in: Atom