SabreCat 0442b87608 fix(news): merge conflict

2017-04-11 22:23:27 +00:00

..

avatar

v3.83.5 End Fooling (#8638)

2017-04-02 09:02:15 -05:00

header

Thehollidayinn/group plans part 2 (#8262)

2016-12-21 13:45:45 -06:00

modals

Merge branch 'checkin-complete-msg' of https://github.com/Yutsuten/habitica into Yutsuten-checkin-complete-msg

2017-04-11 17:08:43 +02:00

profiles

Updating attribute calculation to look at all equipment #8188 (#8202)

2017-02-07 12:04:12 -07:00

tasks

Task notes modals (#8521)

2017-03-27 09:10:21 -06:00

footer.jade

fix text problems in Community Guidelines and broken email links; also add press kit link (#8623)

2017-03-31 18:07:18 +02:00

formatting-help.jade

Format files to adhere to editorconfig (#7977)

2016-09-07 12:58:26 -05:00

mixins.jade

Make Wikia Links Translatable (#7036)

2016-09-29 21:57:44 +10:00

new-stuff.jade

fix(news): merge conflict

2017-04-11 22:23:27 +00:00

noscript.jade

Adjust styling of noscript block

2015-11-17 21:35:07 -06:00