Commit Graph

2 Commits (e21c26689a28100cb0e8a40a414b55ed6ac469fc)

Author SHA1 Message Date
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
7 years ago
Mike Koch e44baa99c2 Refactored custom field validator, re-enabled test 7 years ago