Merge branch 'master' into 'develop'

# Conflicts:
#   .firebaserc
remotes/1719447575336928982/master
Igor Laborie 6 years ago
parent 38426e2c49
commit e0d4c06741
  1. 2
      .firebaserc

@ -1,6 +1,6 @@
{ {
"projects": { "projects": {
"default": "sandbox-devfesttoulouse", "default": "sandbox-devfesttoulouse",
"prod": "2019-devfesttoulouse" "prod": "devfesttoulouse-1f1dc"
} }
} }

Loading…
Cancel
Save