Skip to content
Snippets Groups Projects
Commit f2316835 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge origin/Org_dev 

Conflicts:
	aliasDefinition/Data_alias/Data_alias.aod
	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
	others/db_changes/masterChangelog.xml
parents 9d4ee4a9 f26fcd1f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 821 additions and 4 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