BGBM BDI Projects / cdmlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8a65784 334b7b2)
Merge branch 'develop' into feature/cdm-4.7
authorAndreas Müller <a.mueller@bgbm.org>
Sat, 3 Jun 2017 17:16:37 +0000 (19:16 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Sat, 3 Jun 2017 17:16:37 +0000 (19:16 +0200)
commitcb666204f7919149d959396a4a7619df826ab3ab
tree8bd0750e2a6b03ff64ec9b93421a688914e30371tree | snapshot
parent8a6578476afa6366fb45f88a38b232b4b659ef12commit | diff
parent334b7b2b36477c2eb7e20c9daddaf376aa4c3983commit | diff
Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java diff1 | diff2 | blob | history