Merge branch 'develop' into release/3.0.0

client/src/app/+my-account/my-account-applications/my-account-applications.component.ts

@@ -14,7 +14,7 @@ export class MyAccountApplicationsComponent implements OnInit {
   feedUrl: string
   feedToken: string
 
-  private baseURL = environment.originServerUrl
+  private baseURL = environment.originServerUrl || window.location.origin
 
   constructor (
     private authService: AuthService,

client/src/app/modal/quick-settings-modal.component.html

@@ -5,7 +5,7 @@
   </div>
 
   <div class="modal-body">
-    <div class="mb-4 font-italic">These settings apply only to your session on this instance.</div>
+    <div i18n class="mb-4 font-italic">These settings apply only to your session on this instance.</div>
 
     <div i18n class="mb-4 quick-settings-title">Display settings</div>