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

..

installSql.php

Merge remote-tracking branch 'remotes/origin/master' into api-rewrite

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

uninstallSql.php

Fix unintall SQL

2017-01-02 16:26:10 -05:00