Skip to content
Snippets Groups Projects
Commit 6488c87d authored by Andre Loreth's avatar Andre Loreth
Browse files

Merge branch 'master' of gitlab.adito.de:xrm/basic into Fix_1035784 

# Conflicts:
#	entity/Document_entity/Document_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents 391d6811 9301c5ff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 258 additions and 26 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