Adrian Hopek d7d84a1b30 Merge branch 'main' into #4-users-crud ...

# Conflicts:
#	.env.example
#	app/Http/Controllers/GoogleController.php
#	app/Http/Middleware/Authenticate.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	database/factories/UserFactory.php
#	database/migrations/2014_10_12_000000_create_users_table.php
#	package-lock.json
#	package.json
#	resources/js/Pages/Login.vue
#	resources/js/Shared/Layout/GuestLayout.vue
#	resources/js/Shared/MainMenu.vue
#	resources/js/app.js
#	resources/lang/pl.json
#	routes/web.php

2022-01-18 10:06:53 +01:00

..

Controller.php

#1 - project skeleton (#7)

2022-01-10 13:28:18 +01:00

GoogleController.php

#2 - authentication via google (#16)

2022-01-13 14:19:11 +01:00

LogoutController.php

#2 - authentication via google (#16)

2022-01-13 14:19:11 +01:00

UserController.php

Merge remote-tracking branch 'origin/#4-users-crud' into #4-users-crud

2022-01-18 07:51:08 +01:00