John Firebaugh 39ffcbc6a2 Fix merge conflict		2013-11-06 11:10:02 -08:00
..
assets	user menu fix	2013-11-06 13:17:36 -05:00
controllers	Improve pagination	2013-11-05 12:25:54 -08:00
helpers	Link search results directly to browse pages	2013-11-05 12:26:59 -08:00
models	Remove never actually used code from five years ago	2013-10-11 20:03:06 +01:00
views	Fix merge conflict	2013-11-06 11:10:02 -08:00