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/js/views/SetupWizard/EnvironmentSetup.vue

@@ -172,6 +172,9 @@ export default {
 
             if (this.storage.driver === 'backblaze')
                 this.storage.endpoint = 'https://s3.' + val + '.backblazeb2.com'
+
+			if (this.storage.driver === 'oss')
+				this.storage.endpoint = 'https://' + val + '.aliyuncs.com'
         },
     },
     computed: {
@@ -189,12 +192,65 @@ export default {
                 case 'backblaze':
                     return this.backblazeRegions
                     break
+				case 'oss':
+					return this.ossRegions
+					break
             }
         },
     },
     data() {
         return {
             isLoading: false,
+			ossRegions: [
+				{
+					label: 'China (Hangzhou)',
+					value: 'oss-cn-hangzhou',
+				},
+				{
+					label: 'China (Shanghai)',
+					value: 'oss-cn-shanghai',
+				},
+				{
+					label: 'China (Qingdao)',
+					value: 'oss-cn-qingdao',
+				},
+				{
+					label: 'China (Beijing)',
+					value: 'oss-cn-beijing',
+				},
+				{
+					label: 'China (Zhangjiakou)',
+					value: 'oss-cn-zhangjiakou',
+				},
+				{
+					label: 'China (Hohhot)',
+					value: 'oss-cn-huhehaote',
+				},
+				{
+					label: 'China (Ulanqab)',
+					value: 'oss-cn-wulanchabu',
+				},
+				{
+					label: 'China (Shenzhen)',
+					value: 'oss-cn-shenzhen',
+				},
+				{
+					label: 'China (Heyuan)',
+					value: 'oss-cn-heyuan',
+				},
+				{
+					label: 'China (Guangzhou)',
+					value: 'oss-cn-guangzhou',
+				},
+				{
+					label: 'China (Chengdu)',
+					value: 'oss-cn-chengdu',
+				},
+				{
+					label: 'China (Hong Kong)',
+					value: 'oss-cn-hongkong',
+				},
+			],
             wasabiRegions: [
                 {
                     label: 'US East 1 (N. Virginia)',
@@ -352,6 +408,10 @@ export default {
                     label: 'Backblaze B2 Cloud Storage',
                     value: 'backblaze',
                 },
+				{
+					label: 'Alibaba Cloud OSS',
+					value: 'oss',
+				},
             ],
             encryptionList: [
                 {