Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade

Conflicts: www/application/controllers/Auth.php
2020-02-08 00:39:03 -05:00
parent 275e53d319 78381960f4
commit 31a7cb3508
16 changed files with 357 additions and 243 deletions
@@ -3,5 +3,4 @@
 # Created by configure

 './configure' \
-'--enable-coregrade_api' \
 "$@"