Seth Call 5fe49e4b15 merge develop		2016-07-02 21:17:24 -05:00
..
environments	merge develop	2016-07-02 21:17:24 -05:00
initializers	merge develop	2016-07-02 21:17:24 -05:00
locales	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
application.rb	merge develop	2016-07-02 21:17:24 -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	* update teacher dump admin page and add new URL	2016-03-25 12:08:23 -05:00
unicorn.rb	* VRFS-1010 possibly done	2014-01-30 15:51:05 -06:00