Skip to content
Snippets Groups Projects
Commit ef94e980 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge master into 1035100-AnpassungenMeilensteinen 

Conflicts:
	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
	others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
	others/db_changes/data_alias/struct/create_salesproject.xml
parents 271f18b4 c00704a0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 229 additions and 40 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