Tristan 66dec09d6b wMerge branch 'master' of https://git.heroku.com/papercut-server into rails5-upgrade		2018-07-25 18:44:16 -05:00
..
attributes	Link deities to religions	2018-07-21 18:06:58 -05:00
environments	upgrade fixes	2018-07-04 20:46:21 -05:00
initializers	rake rails:update	2018-07-04 20:14:51 -05:00
locales	restore i18n file	2018-07-04 20:47:38 -05: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	lower workers in main thread to 0????	2018-01-18 20:02:10 -06:00
routes.rb	restore routes	2018-07-04 20:48:40 -05:00
secrets.yml	rake rails:update	2018-07-04 20:14:51 -05:00