Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	module_list.md
This commit is contained in:
Dennis Eichhorn 2016-08-13 14:16:55 +02:00
commit 671fc22d2e

View File

@ -53,5 +53,5 @@
* 1005300000 - OMS Editor
* 1005400000 - OMS SalesAnalysis
* 1005500000 - OMS Workflow
* 1005600000 -
* 1005700000 - OMS Job
* 1005600000 - OMS Database
* 1005700000 - OMS Job