Merge branch 'main' into #4-users-crud

# Conflicts:
#	composer.lock
#	resources/js/Shared/MainMenu.vue
This commit is contained in:
Adrian Hopek
2022-01-18 12:23:35 +01:00
15 changed files with 258 additions and 26 deletions

View File

@@ -21,6 +21,7 @@
"enlightn/enlightn": "^1.22",
"facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
"laravel/dusk": "^6.21",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^5.10",
"phpunit/phpunit": "^9.5.10"