Commit Graph

4 Commits

Author SHA1 Message Date
e4fb438721 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/Http/Controllers/TeamFileController.php
#	app/TeamFile.php
#	config/adminlte.php
#	routes/web.php
2020-11-02 21:50:30 +00:00
96aa01b9c6 Recent changes 2020-11-02 21:44:05 +00:00
d5d23b7dbd Apply fixes from StyleCI 2020-10-11 01:54:22 +00:00
9b4bdefd81 RSM-78 Add OneSignal credential config and others 2020-10-10 18:22:38 +01:00