BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 749a9d9 765dfea)
Merge branch 'hotfix/3.12.3' into develop
authorjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:37:37 +0000 (11:37 +0100)
committerjenkins <jenkins-int@bgbm.org>
Wed, 20 Jan 2016 10:37:37 +0000 (11:37 +0100)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java


Trivial merge