Skip to content
Snippets Groups Projects
user avatar
Simon Leipold authored
 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
da701224
History