Merge branch 'master' into 'develop'

# Conflicts: # .firebaserc
6 years ago · e0d4c06741
parent 38426e2c49
commit e0d4c06741
1 changed files with 1 additions and 1 deletions
--- a/.firebaserc
+++ b/.firebaserc
@ -1,6 +1,6 @@
 {
  "projects": {
    "default": "sandbox-devfesttoulouse",
-    "prod": "2019-devfesttoulouse"
+    "prod": "devfesttoulouse-1f1dc"
  }
 }