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

Browse Source

Conflicts:
	www/application/controllers/Auth.php

...

This commit is contained in:

Toks Law

2020-02-08 00:39:03 -05:00

parent 275e53d319 78381960f4

commit 31a7cb3508

16 changed files with 357 additions and 243 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

coregrade/src/mailsend/mailsend

BIN

Binary file not shown.