mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 07:37:25 +01:00
Conflicts: common/dist/sprites/spritesmith-main-5.css common/dist/sprites/spritesmith-main-5.png common/dist/sprites/spritesmith-main-6.css common/dist/sprites/spritesmith-main-6.png common/dist/sprites/spritesmith-main-7.css common/dist/sprites/spritesmith-main-7.png common/dist/sprites/spritesmith-main-8.css common/dist/sprites/spritesmith-main-8.png common/dist/sprites/spritesmith-main-9.css common/dist/sprites/spritesmith-main-9.png