Merge branch 'release' into develop

This commit is contained in:
Sabe Jones 2020-02-05 05:32:18 -06:00
commit 4f10f534ee
3 changed files with 3 additions and 2 deletions

2
package-lock.json generated
View file

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

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": "4.132.0", "version": "4.132.1",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@babel/core": "^7.8.4", "@babel/core": "^7.8.4",

View file

@ -757,5 +757,6 @@ export default {
<style src="@/assets/css/sprites/spritesmith-main-24.css"></style> <style src="@/assets/css/sprites/spritesmith-main-24.css"></style>
<style src="@/assets/css/sprites/spritesmith-main-25.css"></style> <style src="@/assets/css/sprites/spritesmith-main-25.css"></style>
<style src="@/assets/css/sprites/spritesmith-main-26.css"></style> <style src="@/assets/css/sprites/spritesmith-main-26.css"></style>
<style src="@/assets/css/sprites/spritesmith-main-27.css"></style>
<style src="@/assets/css/sprites.css"></style> <style src="@/assets/css/sprites.css"></style>
<style src="smartbanner.js/dist/smartbanner.min.css"></style> <style src="smartbanner.js/dist/smartbanner.min.css"></style>