Merge branch 'main' into update-to-yearly-billing-on-same-team-type

Author: hardillb

frontend/src/components/banners/TeamTrial.vue

@@ -25,7 +25,7 @@
             <span v-else>
                 Your trial has ended.
                 <span v-if="!team.billing?.active">
-                    You will need to setup billing to continuing using this team.
+                    You will need to setup billing to continue using this team.
                 </span>
             </span>
         </span>

frontend/src/pages/team/Billing.vue

@@ -92,7 +92,7 @@
                     </template>
                     <template v-else>
                         <p>
-                            You trial has ended. You will need to setup billing to continuing using this team.
+                            You trial has ended. You will need to setup billing to continue using this team.
                         </p>
                     </template>
                 </template>