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
..
environments	Add JSON LD blocks to User pages	2016-09-06 10:23:05 -05:00
initializers	Send emails from notebook@notebook.ai instead	2016-09-01 23:37:34 -05:00
locales	Add devise	2016-04-04 22:58:47 -05:00
application.rb	Add content groupers / organize models	2016-05-03 12:57:00 -05:00
boot.rb	Merge resolution	2015-03-13 20:12:42 -05:00
cucumber.yml	Add Cucumber	2016-07-11 20:46:35 -05:00
database.yml	Add Cucumber	2016-07-11 20:46:35 -05:00
database.yml.travis	Set up Travis to use a PostgreSQL database for testing	2015-03-13 20:18:49 -05:00
environment.rb	Merge resolution	2015-03-13 20:12:42 -05:00
routes.rb	Two takes on landing pages, each wip	2016-09-14 23:53:52 -05:00
secrets.yml	add devise secret	2016-04-07 01:14:04 -05:00