Tyler Renelle 313ec3d869 Merge branch 'develop' into bs3 ... Conflicts: views/options/social/tavern.jade		2014-02-07 23:41:14 -07:00
..
main	refactor(bs3): misc fixes, use bootstrap own grid for tasks lists	2014-02-04 21:27:05 +01:00
options	Merge branch 'develop' into bs3	2014-02-07 23:41:14 -07:00
shared	fix(mounts): fix pets & mounts css to position the user based on	2014-02-07 21:48:11 -07:00
static	refactor(bs3): sync with develop	2014-02-04 19:59:48 +01:00
index.jade	refactor(bs3): push footer down	2014-02-06 18:46:43 +01:00