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

Merge branch 'master' into campaignmanagement

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	others/db_changes/data_alias/basic/2019.2/changelog.xml
#	process/KeywordRegistry_basic/process.js
parents 4edf9668 813fb966
No related branches found
No related tags found
No related merge requests found
Showing
with 293 additions and 7 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment