Tyler Renelle 3473b73452 chore(Merge): branch 'develop' into bs3 ...

Conflicts:
	views/options/inventory/inventory.jade

2014-02-07 17:42:12 -07:00

..

header

refactor(bs3): port quests modals, fix restore modal and various bugs

2014-02-02 16:43:58 +01:00

modals

chore(Merge): branch 'develop' into bs3

2014-02-07 17:42:12 -07:00

profiles

refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc

2014-02-05 19:05:42 +01:00

tasks

refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc

2014-02-05 19:05:42 +01:00

footer.jade

refactor(bs3): sync with develop

2014-02-06 17:36:33 +01:00

formatting-help.jade

Replace hard coded strings for env.t on views/shared/ folder.

2013-12-31 00:15:53 -02:00

gems.jade

refactor(bs3): port some modals & css fixes

2014-02-01 19:19:48 +01:00