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

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

# Conflicts:
#	entity/Salesproject_entity/Salesproject_entity.aod
parents 1f3e7df5 48762239
No related branches found
No related tags found
No related merge requests found
Showing
with 1159 additions and 88 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