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
..
inventory	Changed hints style (and small quick fixes)	2014-02-16 10:13:16 -05:00
social	chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop	2014-02-20 16:34:28 -08:00
index.jade	refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc	2014-02-05 19:05:42 +01:00
profile.jade	Changed hints style (and small quick fixes)	2014-02-16 10:13:16 -05:00
settings.jade	chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop	2014-02-20 16:34:28 -08:00