Skip to content
Snippets Groups Projects
Commit a0e82fc9 authored by Dominik Lechner's avatar Dominik Lechner
Browse files

Merge branch 'master' into campaignmanagement 

# Conflicts:
#	entity/Campaign_entity/Campaign_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents 10b978f2 a1efe92d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2906 additions and 449 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