Luke Pulverenti c957ca936f update components ... Conflicts: MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js		2016-01-30 13:51:20 -05:00
..
Api	merge from dev	2016-01-12 14:55:45 -05:00
Properties	added a master version file	2013-02-22 02:17:50 -05:00
MediaBrowser.WebDashboard.csproj	update components	2016-01-30 13:51:20 -05:00
packages.config	update commonio	2016-01-16 23:26:08 -05:00
ServerEntryPoint.cs	removed plugin configuration pages from the kernel	2013-03-04 23:34:00 -05:00