Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2020-12-17 08:25:26 -06:00
3 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.175.1",
"version": "4.175.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.175.1",
"version": "4.175.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.12.10",
@@ -6,9 +6,8 @@ import {
SEASONAL_SETS,
} from '../content/constants';
const CURRENT_EVENT = find(EVENTS, event => {
moment().isBetween(event.start, event.end);
});
const CURRENT_EVENT = find(EVENTS, event => moment().isBetween(event.start, event.end));
const SHOP_OPEN = CURRENT_EVENT && ['winter', 'spring', 'summer', 'fall'].includes(CURRENT_EVENT.season);
export default {