notebook/config
Andrew Brown 577de5f447 Merge branch 'master' into thredded
Conflicts:
	db/schema.rb
2017-09-30 15:44:27 +02:00
..
attributes polishing 2017-07-31 03:49:24 +02:00
environments Rename app internally from PlanCharacters to Notebook 2017-05-23 19:59:01 +00:00
initializers polishing 2017-07-26 20:53:05 +02:00
locales Merge branch 'master' into thredded 2017-09-30 15:44:27 +02:00
application.rb Rename app internally from PlanCharacters to Notebook 2017-05-23 19:59:01 +00: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 Puma and config some threading 2016-10-03 17:27:28 -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
puma.rb Add Puma and config some threading 2016-10-03 17:27:28 -05:00
routes.rb Merge branch 'master' into thredded 2017-09-30 15:44:27 +02:00
secrets.yml add devise secret 2016-04-07 01:14:04 -05:00