Jonathan Kolyer e5d23cc3bd merge conflicts		2014-01-08 18:45:34 -06:00
..
environments	websock set timeout on development build	2014-01-08 22:42:10 +00:00
initializers	vrfs-774: changed city for Kolyer to Austin	2013-11-15 13:53:34 -06:00
locales	merging jam-web into web	2013-09-15 18:04:37 +00:00
application.rb	merge conflicts	2014-01-08 18:45:34 -06:00
aws.yml	merging jam-web into web	2013-09-15 18:04:37 +00:00
boot.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00
cucumber.yml	merging jam-web into web	2013-09-15 18:04:37 +00:00
database.yml	merging jam-web into web	2013-09-15 18:04:37 +00:00
environment.rb	* VRFS-821 many changes for upload apis, mostly	2013-12-17 19:44:21 +00: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
routes.rb	* VRFS-946 - in-session recording	2014-01-05 03:47:23 +00:00
unicorn.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00