Tom Hughes 68a3df4d53 Merge branch 'redesign' ... Conflicts: app/assets/stylesheets/common.css.scss		2013-11-28 17:30:53 +00:00
..
assets	Simplify browse routes and make routes more consistent	2013-11-28 00:14:07 +00:00
controllers	Fix feed link for pushState loaded history page	2013-11-25 15:47:42 -08:00
helpers	Fix test failures	2013-11-19 10:30:18 -08:00
models	Remove never actually used code from five years ago	2013-10-11 20:03:06 +01:00
views	Merge branch 'redesign'	2013-11-28 17:30:53 +00:00