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

Merge master into turnover-exampledata

Conflicts:
	others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
	others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
	others/db_changes/masterChangelog.xml
parents 0b9f5ebe a2ea9ea8
No related branches found
No related tags found
Loading
Showing
with 248 additions and 21 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment