Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2019-02-08 06:08:05 -06:00
commit ef412c7185
3 changed files with 3 additions and 2 deletions

2
package-lock.json generated
View file

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

View file

@ -649,5 +649,6 @@ export default {
<style src="assets/css/sprites/spritesmith-main-21.css"></style>
<style src="assets/css/sprites/spritesmith-main-22.css"></style>
<style src="assets/css/sprites/spritesmith-main-23.css"></style>
<style src="assets/css/sprites/spritesmith-main-24.css"></style>
<style src="assets/css/sprites.css"></style>
<style src="smartbanner.js/dist/smartbanner.min.css"></style>