Mike Koch df503face9 Merge remote-tracking branch 'remotes/origin/master' into api-rewrite ...

# Conflicts:
#	build.php
#	install/install_functions.inc.php
#	install/mods-for-hesk/ajax/install-database-ajax.php
#	install/mods-for-hesk/installModsForHesk.php
#	install/mods-for-hesk/js/version-scripts.js
#	install/mods-for-hesk/modsForHesk.php
#	install/mods-for-hesk/sql/installSql.php
#	knowledgebase.php

2017-04-12 19:58:30 -04:00

..

admin

Add universal CORS restriction

2016-06-11 22:11:05 -04:00

calendar

Add universal CORS restriction

2016-06-11 22:11:05 -04:00

core

Update database/database_mysqli for api,internal-api,cron

2017-04-11 21:49:43 -04:00

dao

Show stack traces on the message log page

2017-03-12 20:57:36 -04:00

js

Show stack traces on the message log page

2017-03-12 20:57:36 -04:00

ticket

Add universal CORS restriction

2016-06-11 22:11:05 -04:00