Andrew Brown ecd252a1cd Merge branch 'master' into documents		2018-11-14 14:47:42 -06:00
..
attributes	fix	2018-11-10 02:49:22 -06:00
environments	enable bullet	2018-09-10 02:30:56 -05:00
initializers	redesign customize content page header	2018-11-09 13:55:14 -06:00
locales	add job field to characters	2018-11-08 18:52:46 -06:00
application.rb	rails 5 prep	2018-07-05 01:10:52 -05:00
boot.rb	rake rails:update	2018-07-04 20:14:51 -05:00
cucumber.yml	Add Cucumber	2016-07-11 20:46:35 -05:00
database.yml	TEMPORARY COMMIT FOR STAGING	2018-07-25 18:41:56 -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
newrelic.yml	move config NR file	2017-10-27 21:42:53 +03:00
puma.rb	default puma concurrency to 1 worker	2018-10-21 18:08:23 -05:00
routes.rb	Merge branch 'master' into documents	2018-11-14 14:47:42 -06:00
secrets.yml	rake rails:update	2018-07-04 20:14:51 -05:00