Merge pull request #645 from AuraOfDivinity/dev-master-conflicts

Dev master conflicts
codeuino · Oct 17, 2020 · 873b006 · 873b006
2 parents ed3f2f0 + 8c61bd5
commit 873b006
Show file tree

Hide file tree

Showing 193 changed files with 6,857 additions and 1,340 deletions.
diff --git a/.env.production b/.env.production
@@ -1,2 +1,2 @@
 #.env.production
-REACT_APP_API_ENDPOINT = "https://codeuino-donut-development.herokuapp.com"
+REACT_APP_API_ENDPOINT = "https://gsoc-donut.herokuapp.com"
diff --git a/README.md b/README.md