mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 08:21:07 +00:00
Conflicts: styles/app/index.styl styles/app/tasks.styl views/app/alerts.html views/app/avatar.html views/app/header.html views/app/index.html Merge branch 'develop' into zakkain-ui-tweaks Conflicts: styles/app/index.styl styles/app/tasks.styl views/app/alerts.html views/app/avatar.html views/app/header.html views/app/index.html by popular demand, we're dropping the crosshatched square and going blank Conflicts: styles/app/tasks.styl |
||
|---|---|---|
| .. | ||
| alerts.styl | ||
| avatar.styl | ||
| color-vars.styl | ||
| customizer.styl | ||
| female_sprites.styl | ||
| header.styl | ||
| helpers.styl | ||
| index.styl | ||
| items.styl | ||
| male_sprites.styl | ||
| responsive.styl | ||
| scrollbars.styl | ||
| shop_sprites.styl | ||
| tasks.styl | ||