jellyfin-server/MediaBrowser.WebDashboard
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
2013-02-22 14:00:26 -05:00
..
Api created IWebSocketListener 2013-02-22 10:16:48 -05:00
Html removed deprecated code 2013-02-22 09:46:39 -06:00
Properties added a master version file 2013-02-22 02:17:50 -05:00
MediaBrowser.WebDashboard.csproj added a master version file 2013-02-22 02:17:50 -05:00
packages.config Pushing missing changes 2013-02-20 20:33:05 -05:00