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
..
admin	Merge branch 'develop' into feature/jam_tracks	2015-01-04 09:31:33 -06:00
assets	VRFS-1890 : Mechanism to move track up/down, hook up in admin UI.	2014-12-06 14:04:31 -06:00
controllers	* VRFS-2104 - client update dialog happens when it needs to; not just on startup	2014-08-31 10:30:59 -05:00
helpers	* icecast working locally on my mac (VRFS-1002)	2014-01-21 14:51:03 +00:00
mailers	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
models	VRFS-1576 error handling; referral page; new admin menu	2014-04-22 01:55:40 +00:00
uploaders	* VRFS-1089 - jamadmin creation of recordings done	2014-02-13 16:41:50 +00:00
views	VRFS-2480: Additional back-end and UI functionality required for checking out.	2014-12-01 18:45:41 -06:00