Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2017-12-01 00:31:23 +00:00
commit 56d09411d9
3 changed files with 3 additions and 3 deletions

2
package-lock.json generated
View file

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

View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.12.2",
"version": "4.12.3",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",

View file

@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
import each from 'lodash/each';
import t from './translation';
const CURRENT_SEASON = 'November';
const CURRENT_SEASON = 'NONE';
let drops = {
Base: {