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

Merge branch 'master' into campaignmanagement 

# Conflicts:
#	aliasDefinition/Data_alias/Data_alias.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	others/db_changes/data_alias/basic/2019.2/changelog.xml
parents cf0e9b6b 49feab26
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1143 additions and 72 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