Commit Graph

10 Commits

Author SHA1 Message Date
tokslaw b7730bfb3d Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-09 16:37:02 -05:00
ameye 2b0cd9bc6f fix 2020-02-09 16:36:41 -05:00
tokslaw 97433d9edb Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-09 16:32:51 -05:00
ameye 5a3f305ad3 fix 2020-02-09 16:29:21 -05:00
tokslaw 017138ca27 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade 2020-02-08 19:39:05 -05:00
ameye 717193831d fix 2020-02-08 19:38:13 -05:00
tokslaw d22e134b7a fix register_login 2020-02-08 16:43:24 -05:00
tokslaw a1ffee1689 fix the deafult page text 2020-02-08 01:23:46 -05:00
tokslaw 31a7cb3508 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade
Conflicts:
	www/application/controllers/Auth.php
2020-02-08 00:39:03 -05:00
ameye 255f3faf3b fix 2020-02-07 14:21:08 -05:00