Merge branch 'master' into dms

2026-03-10 21:25:04 +00:00 · 2019-12-04 15:56:42 -05:00
parent 09a3ccd12d 7efed257f2
commit 374c4d45b0
18 changed files with 1446 additions and 583 deletions
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -45,5 +45,5 @@
      "last 1 safari version"
    ]
  },
-  "proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
+  "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
 }