Skip to content
Snippets Groups Projects
Commit da701224 authored by Simon Leipold's avatar Simon Leipold
Browse files

Merge branch 'master' into 1036804-Permissions 

 Conflicts:
	.aditoprj/project.version
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
	entity/Contract_entity/Contract_entity.aod
	entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
parents 5565ff58 35afd899
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2528 additions and 1735 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