Merge branch 'master' of gitlab.adito.de:xrm/basic

# Conflicts: # entity/Salesproject_entity/Salesproject_entity.aod

Merge branch 'master' of gitlab.adito.de:xrm/basic
c1ef978e · Maximilian Schröger · 1f3e7df5 · 48762239 · c1ef978e · c1ef978e
Commit c1ef978e authored 6 years ago by Maximilian Schröger
--- a/out/UrlUtils.html
+++ b/out/UrlUtils.html
--- a/out/Util_lib_process.js.html
+++ b/out/Util_lib_process.js.html
--- a/out/api.js
+++ b/out/api.js
--- a/out/assets/css/external-small.png
+++ b/out/assets/css/external-small.png
--- a/out/assets/css/logo.png
+++ b/out/assets/css/logo.png
--- a/out/assets/css/main.css
+++ b/out/assets/css/main.css
--- a/out/assets/favicon.ico
+++ b/out/assets/favicon.ico
--- a/out/assets/img/spinner.gif
+++ b/out/assets/img/spinner.gif
--- a/out/assets/index.html
+++ b/out/assets/index.html
--- a/out/assets/js/api-filter.js
+++ b/out/assets/js/api-filter.js
--- a/out/assets/js/api-list.js
+++ b/out/assets/js/api-list.js
--- a/out/assets/js/api-search.js
+++ b/out/assets/js/api-search.js
--- a/out/assets/js/apidocs.js
+++ b/out/assets/js/apidocs.js
--- a/out/assets/js/yui-prettify.js
+++ b/out/assets/js/yui-prettify.js
--- a/out/assets/vendor/prettify/CHANGES.html
+++ b/out/assets/vendor/prettify/CHANGES.html
--- a/out/assets/vendor/prettify/COPYING
+++ b/out/assets/vendor/prettify/COPYING
--- a/out/assets/vendor/prettify/README.html
+++ b/out/assets/vendor/prettify/README.html
--- a/out/assets/vendor/prettify/prettify-min.css
+++ b/out/assets/vendor/prettify/prettify-min.css
--- a/out/assets/vendor/prettify/prettify-min.js
+++ b/out/assets/vendor/prettify/prettify-min.js
--- a/out/classes/index.html
+++ b/out/classes/index.html