Tim Hobbs 087b556730 Merge remote-tracking branch 'upstream/master'		2014-03-30 16:28:19 -07:00
..
Api	Cast updates	2014-03-30 16:26:16 -07:00
Properties	added a master version file	2013-02-22 02:17:50 -05:00
ApiClient.js	restored live tv playback in the web client	2014-03-30 12:49:40 -04:00
MediaBrowser.WebDashboard.csproj	stub out web client media controller	2014-03-29 11:40:32 -04:00
packages.config	restored live tv playback in the web client	2014-03-30 12:49:40 -04:00
ServerEntryPoint.cs	removed plugin configuration pages from the kernel	2013-03-04 23:34:00 -05:00