Peter Papp c52c576f7c Merge remote-tracking branch 'origin/master' into oasis ...

# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json

2021-06-29 18:38:53 +02:00

..

AppServiceProvider.php

Filename as original

2021-06-18 17:23:40 +02:00

AuthServiceProvider.php

code style fix

2021-04-25 09:02:00 +02:00

BroadcastServiceProvider.php

code style fix

2021-04-25 09:02:00 +02:00

EventServiceProvider.php

code style fix

2021-04-25 09:02:00 +02:00

FortifyServiceProvider.php

code style fix

2021-04-25 09:02:00 +02:00

RouteServiceProvider.php

Merge remote-tracking branch 'origin/master' into oasis

2021-04-29 11:06:14 +02:00