Merged updates from other projects

2018-05-07 21:34:10 +10:00
parent d6cb505e1c
commit e9cad27afc
26 changed files with 16763 additions and 2811 deletions
--- a/app/User.php
+++ b/app/User.php
@@ -50,4 +50,4 @@ class User extends Authenticatable
    {
        return $this->firstname.' '.$this->lastname;
    }
-}
+}