Merge branch 'master' into production

Author: matthiasharzer

.github/workflows/firebase-hosting-merge.yml

@@ -2,7 +2,7 @@
 # https://github.com/firebase/firebase-tools
 
 name: Deploy to Firebase Hosting on merge
-'on':
+on:
   push:
     branches:
       - production