Miguel Nogueira 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
..
TeamFileFactory.php	Merge remote-tracking branch 'origin/develop' into develop	2020-11-02 21:50:30 +00:00
UserFactory.php	Recent changes	2020-11-02 21:44:05 +00:00