Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests.		2014-11-04 14:55:12 -06:00
..
environments	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
god	* comment in god file about pending removal	2014-01-13 22:53:37 +00:00
initializers	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
locales	merging jam-web into web	2013-09-15 18:04:37 +00:00
application.rb	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
aws.yml	merging jam-web into web	2013-09-15 18:04:37 +00:00
boot.rb	* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg	2014-02-04 20:28:00 +00:00
cucumber.yml	merging jam-web into web	2013-09-15 18:04:37 +00:00
database.yml	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
environment.rb	* fix for VRFS-1023; bugsnag preventing rails from starting	2014-01-25 21:07:39 -06:00
logging.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00
newrelic.yml	* VRFS-694 adding newrelic to rails	2013-09-18 20:14:37 +00:00
profanity.yml	merging jam-web into web	2013-09-15 18:04:37 +00:00
resque.yml	* VRFS-801 - almost working on my dev machine	2014-01-11 04:57:07 +00:00
routes.rb	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
scheduler.yml	VRFS-2282 first pass purging stale sessions	2014-10-12 07:49:31 +00:00
unicorn.rb	* fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643	2014-04-23 15:08:19 +00:00