Steven Miers 294c01d44a Merge with latest develop		2015-05-11 17:25:37 -05:00
..
environments	* VRFS-3082 - email alert if jamtrack fails	2015-04-23 10:34:17 -05:00
initializers	Merge with latest develop	2015-05-11 17:25:37 -05:00
locales	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
application.rb	* VRFS-3094 - update style and minor issues in shopping cart screen	2015-04-27 15:42:38 -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-2839 - add check to admin	2015-02-25 22:04:58 -06:00
unicorn.rb	* VRFS-1010 possibly done	2014-01-30 15:51:05 -06:00