Robert Richter 40481975f4 Merge branch 'master' into feature/migrate-tests		2016-10-01 14:38:51 -05:00
..
environments	Extract content tests into an example	2016-10-01 12:21:19 -05:00
initializers	Send emails from notebook@notebook.ai instead	2016-09-01 23:37:34 -05:00
locales	comment out relations from serendip card	2016-09-30 04:18:40 +02:00
application.rb	Display user image to their profile page	2016-09-21 21:13:30 -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	Merge master	2016-09-29 20:06:41 -05:00
secrets.yml	add devise secret	2016-04-07 01:14:04 -05:00