Skip to content
Snippets Groups Projects
Commit 74f0349f authored by A.Voegl's avatar A.Voegl
Browse files

Merge origin/master into KeywordMigration 

Conflicts:
	entity/Offer_entity/Offer_entity.aod
	entity/Organisation_entity/Organisation_entity.aod
	entity/Salesproject_entity/Salesproject_entity.aod
	entity/Task_entity/Task_entity.aod
	others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
	others/db_changes/masterChangelog.xml
parents 115e64d5 e5f863eb
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 160 additions and 105 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