Seth Call aed848c507 Merge branch 'develop' into feature/jam_tracks ... Conflicts: db/manifest pb/src/client_container.proto ruby/lib/jam_ruby.rb web/config/environments/development.rb web/config/environments/test.rb		2015-01-04 09:31:33 -06:00
..
environments	VRFS-2476 : Field size and length to improve JamTracks Admin UI.	2014-11-16 17:30:49 -06:00
initializers	* wip	2014-12-30 17:10:16 -06:00
locales	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
application.rb	* wip	2014-12-30 17:10:16 -06: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-924 haml added	2014-02-11 15:53:20 +00:00
unicorn.rb	* VRFS-1010 possibly done	2014-01-30 15:51:05 -06:00