habitica-self-host/views/options/social
Tyler Renelle 02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
..
challenge-box.jade chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop 2014-02-20 16:34:28 -08:00
challenges.jade Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
chat-box.jade refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
chat-message.jade refactor(bs3): css 2014-02-09 16:16:43 +01:00
create-group.jade fix(misc): some styles & translations 2014-02-14 18:35:21 +01:00
group.jade chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
hall.jade refactor(bs3): hall form 2014-02-08 20:07:37 +01:00
index.jade fix(header): use strings and a small css fix 2014-02-16 14:51:48 +01:00
tavern.jade chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00