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

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

# Conflicts:
#	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
parents fe38daee a857be50
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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