Commit Graph

9 Commits

Author SHA1 Message Date
tokslaw 8e6d9cc4c4 Merge branch 'master' of https://gitlab.chiefsoft.net/Chiefsoft/CoreGrade
Conflicts:
	www/application/controllers/Auth.php
2020-02-07 12:44:55 -05:00
tokslaw ba7788ddca fix 2020-02-06 18:41:11 -05:00
ameye 5d9da78cf6 fix 2020-02-05 07:15:27 -05:00
ameye d3ccc39e57 fix 2020-02-05 06:05:47 -05:00
ameye 85da8f4403 fix 2020-01-24 23:03:55 -05:00
ameye 43f00c266f fix 2020-01-24 22:54:51 -05:00
ameye f6038e4765 fix 2020-01-24 22:50:29 -05:00
ameye 3f3fdfc85b fix 2020-01-24 18:25:16 -05:00
tokslaw 7f3e301b7d fix 2020-01-24 17:51:59 -05:00