You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

LukePulverenti a7f3c307e1 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser ... Conflicts: MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll		12 years ago
..
Api	created IWebSocketListener	12 years ago
Html	removed deprecated code	12 years ago
Properties	added a master version file	12 years ago
MediaBrowser.WebDashboard.csproj	added a master version file	12 years ago
packages.config	Pushing missing changes	12 years ago