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

Merge remote-tracking branch 'remotes/origin/master' into documentmanagement 

# Conflicts:
#	.liquibase/Data_alias/basic/2019.2/changelog.xml
#	.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
#	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents cf84329e 61d4c0e4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 20 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