From efa2e2850f97ed9a62d52b1af03eb26bf3d43612 Mon Sep 17 00:00:00 2001
From: shamsmosowi <shams.mosowi@gmail.com>
Date: Wed, 15 Sep 2021 20:41:35 +1000
Subject: [PATCH] Merge remote-tracking branch 'upstream/v2' into v2

---
 .gitignore   | 2 ++
 package.json | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index da240881..67830276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ firebase-debug.log*
 
 .eslintcache
 .npm
+
+.vercel
diff --git a/package.json b/package.json
index 5b7f253b..a1d05b50 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "yup": "^0.32.9"
   },
   "scripts": {
+    "upstream": "git fetch upstream;git merge upstream/v2;git push",
     "serve": "serve -s build",
     "start": "craco start",
     "build": "craco build",