Merge branch 'master' into dev

brarsanmol · web-flow · commit 4c9ae8d6b1c1 · 2023-01-28T08:44:38.000-05:00
diff --git a/assets/email/AccountInvitation.hbs b/assets/email/AccountInvitation.hbs
@@ -396,7 +396,7 @@
                                                 McHacks Discord server and opening ceremonies will begin at 7:00 pm. Be
                                                 sure to get set up on the McHacks Discord server at <a
                                                     href="https://discord.gg/XVSdW9pc"
-                                                    style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">https://discord.gg/g4Pya8jcxM</a>
+                                                    style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#F2463A;text-decoration:none;">https://discord.gg/XVSdW9pc</a>
                                                 and contact your coordinator to set up your server roles.
                                                 <br><br>
                                                 Get access to the sponsor dashboard by clicking on the button below.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hackerAPI",
-    "version": "3.1.6",
+    "version": "3.1.4",
     "private": true,
     "scripts": {
         "start": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hackerAPI",`
`3`		`- "version": "3.1.6",`
	`3`	`+ "version": "3.1.4",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",`