Commit 05164182 authored 5 years ago by David Büchler

Merge branch 'master' into campaignmanagement

# Conflicts:
#	.liquibase/Data_alias/basic/2019.2/changelog.xml
#	aliasDefinition/Data_alias/Data_alias.aod
#	entity/Employee_entity/Employee_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

parent 9ff3b4ef

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 39 additions and 39 deletions

Please register or to comment