cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
accept the change from a number to null in TimePeriod fields #5319
Merge branch 'ticket-5066' into develop
Conflicts: cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
minor clean ups
Add cascade merge to members field
#5299 Add new entity listener and event firing
Document new initListener method (#5161)
#5161 Add initListener method to CdmBase object
#5100 Fix default language for remoting
View revisions
Also available in: Atom