Merge branch 'release' into develop

2018-06-19 23:33:19 +00:00
parent 8be9964483 912f00a652
commit 122d147f07
181 changed files with 10773 additions and 9329 deletions
@@ -1,7 +1,7 @@
 {
  "name": "habitica",
  "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.46.2",
+  "version": "4.47.0",
  "main": "./website/server/index.js",
  "dependencies": {
    "@slack/client": "^3.8.1",