Skip to content
Snippets Groups Projects
Commit 94d62001 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
#	.liquibase/Data_alias/changelog.xml
#	aliasDefinition/Data_alias/Data_alias.aod
#	entity/Organisation_entity/Organisation_entity.aod
#	entity/Person_entity/Person_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	others/db_changes/Data_alias/changelog.xml
#	others/db_changes/data_alias/changelog.xml
parents b1c476b0 c9137cab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 0 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