Brian Smith b17dafd94f Merge branch 'develop' into hotfix/feed_icon_fix		2014-04-01 21:31:07 -04:00
..
environments	* VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog	2014-02-07 21:28:47 +00:00
initializers	VRFS-1445 display correct values of musician flag and country in admin	2014-04-01 01:18:31 -04:00
locales	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
application.rb	* adding config in admin needed by web VRFS-1541	2014-03-27 20:14:59 +00: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	* VRFS-801 still working out some mixer devops issues now;	2014-01-13 22:48:55 +00:00
logging.rb	merging jam-admin into admin	2013-09-16 03:15:31 +00: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