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

resources/views/index.blade.php

@@ -40,8 +40,7 @@
         let config = {
             host: '{{ url('/') }}',
             api: '{{ url('/api') }}',
-            locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}',
-            language: '{{ $settings->language ?? 'en' }}',
+            locale: '{{ app()->getLocale() }}',
 
             app_color: '{{ $settings->app_color ?? '#00BC7E' }}',
             app_logo: '{{ $settings->app_logo ?? null }}',