Skip to content
Snippets Groups Projects
Commit d2b4e4ad authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'Produktmanagement' 

# Conflicts:
#	aliasDefinition/Data_alias/Data_alias.aod
#	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
#	entity/Org_entity/Org_entity.aod
#	others/db_changes/masterChangelog.xml
#	process/Keyword_lib/process.js
parents 89265954 7ed01ef7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 602 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