Luke 887c09e737 Merge pull request #1346 from MediaBrowser/master ... merge from master		2015-12-21 12:50:25 -05:00
..
Api	Merge pull request #1346 from MediaBrowser/master	2015-12-21 12:50:25 -05:00
Properties	added a master version file	2013-02-22 02:17:50 -05:00
MediaBrowser.WebDashboard.csproj	restore changes	2015-12-19 23:37:59 -05:00
packages.config	merge from dev	2015-12-14 10:43:03 -05:00
ServerEntryPoint.cs	removed plugin configuration pages from the kernel	2013-03-04 23:34:00 -05:00