Revert "Revert "Revert "Merge branch 'master' into develop"""

This reverts commit 427c9d1c57. *facepalm*
2021-10-13 01:55:12 +01:00
parent 41d86de5b0
commit 2ddef6058d
13 changed files with 1924 additions and 2271 deletions
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -19,8 +19,6 @@
 *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
 */

-namespace Database\Factories;
-
 use App\User;
 use Faker\Generator as Faker;
 use Illuminate\Support\Str;