notebook/app
Andrew Brown 95fd2cf6bd Merge branch 'master' into landing-page-redesign
Conflicts:
	app/views/main/index.html.erb
2016-09-22 05:39:41 +02:00
..
assets Normalize card intro assets to the same size 2016-09-22 05:12:31 +02:00
controllers Two takes on landing pages, each wip 2016-09-14 23:53:52 -05:00
helpers Add users controller + routes for author profiles 2016-09-05 21:51:21 -05:00
mailers Merge resolution 2015-03-13 20:12:42 -05:00
models Extract blacklisted User attributes into a method 2016-09-21 11:44:08 -05:00
views Merge branch 'master' into landing-page-redesign 2016-09-22 05:39:41 +02:00