Luke Pulverenti ca52e8c23b fix merge conflict

2015-12-19 10:54:44 -05:00

..

Api

update components

2015-12-18 12:31:11 -05:00

Properties

added a master version file

2013-02-22 02:17:50 -05:00

MediaBrowser.WebDashboard.csproj

fix merge conflict

2015-12-19 10:54:44 -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