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

# Conflicts:
#	package.json
#	public/9346.js
#	public/chunks/admin.js
#	public/chunks/app-environment.js
#	public/chunks/app-server.js
#	public/chunks/billing.js
#	public/chunks/forgotten-password.js
#	public/chunks/homepage.js
#	public/chunks/plan-create/metered.js
#	public/chunks/plan-settings.js
#	public/chunks/platform.js
#	public/chunks/profile.js
#	public/chunks/recent-uploads.js
#	public/chunks/request.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/authenticate.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/css/tailwind.css
#	public/js/main.js
#	public/js/main.js.LICENSE.txt
#	public/mix-manifest.json

resources/js/views/Frontpage/ContactUs.vue

@@ -30,7 +30,7 @@
                             class="focus-border-theme input-dark"
                             :class="{ '!border-rose-600': errors[0] }"
                         />
-                        <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+                        <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
 
@@ -44,7 +44,7 @@
                             class="focus-border-theme input-dark"
                             :class="{ '!border-rose-600': errors[0] }"
                         ></textarea>
-                        <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+                        <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
 
@@ -121,11 +121,10 @@ export default {
             this.isLoading = true
 
             // Get ReCaptcha token
-            if (config.allowedRecaptcha) {
-                this.register.reCaptcha = await this.$reCaptchaToken('register').then((response) => {
-                    return response
-                })
-            }
+			if (this.config.allowedRecaptcha) {
+				this.contact.reCaptcha = await this.$reCaptchaToken('register')
+					.then((response) => response)
+			}
 
             // Send request to get user token
             axios

resources/js/views/Frontpage/Homepage.vue

@@ -24,7 +24,7 @@
             <MainFeatures />
 
             <!--Pricing Tables-->
-            <PricingTables v-if="config.isSaaS && config.subscriptionType === 'fixed'" />
+            <PricingTables v-if="config.subscriptionType === 'fixed'" />
 
             <!--Get Started Call To Action-->
             <GetStarted />