Skip to content
Snippets Groups Projects
Commit 9ff3b4ef authored by David Büchler's avatar David Büchler
Browse files

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
parents 3b46d053 cb641397
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 635 additions and 162 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment