sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 16:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2020-02-01 12:07:53 -06:00
commit a607882214
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

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

2
package.json
View file

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

2
test/common/ops/buy/purchase.js
View file

@ -13,7 +13,7 @@ import {
} from '../../../helpers/common.helper';
describe('shared.ops.purchase', () => {
const SEASONAL_FOOD = 'Cake_Base';
const SEASONAL_FOOD = 'Meat';
let user;
const goldPoints = 40;
const analytics = { track () {} };

2
website/common/script/content/index.js
View file

@ -192,7 +192,7 @@ api.mountInfo = stable.mountInfo;
// For seasonal events, change this constant:
const FOOD_SEASON = 'Cake';
const FOOD_SEASON = 'Normal';
api.food = {
Meat: {