Skip to content
Snippets Groups Projects
Commit 10e6fa62 authored by Sophia Leierseder's avatar Sophia Leierseder
Browse files

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

# Conflicts:
#	entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
parents cf6d2ce5 7670caad
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment