Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2017-12-05 19:29:34 +00:00
commit b457daa616
3 changed files with 2 additions and 10 deletions

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.12.6",
"version": "4.13.0",
"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.6",
"version": "4.13.0",
"main": "./website/server/index.js",
"dependencies": {
"@slack/client": "^3.8.1",

View file

@ -41,14 +41,6 @@ async function buyArmoire (store, params) {
const quantity = params.quantity || 1;
let armoire = content.armoire;
buyOp(store.state.user.data, {
params: {
key: 'armoire',
},
type: 'armoire',
quantity,
});
// We need the server result because Armoire has random item in the result
let result = await axios.post('/api/v3/user/buy/armoire', {
type: 'armoire',