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

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

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents 80e95a3d 1a201cd7
No related branches found
No related tags found
No related merge requests found
Showing
with 99 additions and 7 deletions
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