Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2017-08-01 22:06:57 +00:00
commit 4f26ac66ac
2 changed files with 2 additions and 2 deletions

View file

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

View file

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