Seth Call 3b71931e73 merge conflict from feature/new_session (VRFS-3283)		2015-07-15 10:04:45 -05:00
..
environments	* VRFS-3082 - email alert if jamtrack fails	2015-04-23 10:34:17 -05:00
initializers	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
locales	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
application.rb	* VRFS-3261 add link to let sendgrid pull our users email info down for emailing out good unsubscribe links	2015-06-10 15:14:15 -05:00
boot.rb	* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg	2014-02-04 20:28:00 +00:00
database.yml	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
environment.rb	* wip	2014-12-30 17:10:16 -06:00
logging.rb	* wip	2014-12-30 17:10:16 -06:00
routes.rb	* VRFS-3261 add link to let sendgrid pull our users email info down for emailing out good unsubscribe links	2015-06-10 15:14:15 -05:00
unicorn.rb	* VRFS-1010 possibly done	2014-01-30 15:51:05 -06:00