sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-20 20:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2019-10-02 06:26:49 -05:00
commit 03f7adf596
4 changed files with 3 additions and 3 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.116.0",
"version": "4.116.1",
"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.116.0",
"version": "4.116.1",
"main": "./website/server/index.js",
"dependencies": {
"@google-cloud/trace-agent": "^4.0.0",

2
website/client/assets/css/sprites/spritesmith-main-6.css
View file

@ -2290,7 +2290,7 @@
width: 114px;
height: 90px;
}
.slim_armor_armoire_shadowMasterRobe {
.slim_armor_armoire_shadowMastersRobe {
background-image: url('~assets/images/sprites/spritesmith-main-6.png');
background-position: -575px -637px;
width: 114px;

0
website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_shadowMasterRobe.png → website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_shadowMastersRobe.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 767 B

After

Width:  |  Height:  |  Size: 767 B