Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.168.0",
+  "version": "4.168.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.168.0",
+  "version": "4.168.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.12.3",

website/common/script/content/constants/events.js

@@ -13,18 +13,13 @@ const gemsPromo = {
 // event gear up until at least the actual end of the event.
 // Unless we want a precise ending, for example during a Gems sale / promotion.
 export const EVENTS = {
-  fall2020SecondPromo: {
-    start: '2020-10-29T08:00-04:00',
-    end: '2020-11-02T20:00-05:00',
-    gemsPromo,
-  },
-  fall2020Interim: {
-    start: '2020-09-30T20:00-04:00',
-    end: '2020-10-29T08:00-04:00',
+  noCurrentEvent: {
+    start: '2020-10-31T20:00-04:00',
+    end: '2020-12-17T08:00-04:00',
   },
   fall2020:   {
     start: '2020-09-22T08:00-04:00',
-    end: '2020-09-30T20:00-04:00',
+    end: '2020-10-31T20:00-04:00',
     gemsPromo,
   },
   // Dates from this point on (^) are in the RFC 2822 format, see https://momentjs.com/docs/#/parsing/string/