LukePulverenti 33ed929b52 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-23 10:32:54 -05:00
2013-02-20 20:33:05 -05:00
2013-02-20 20:33:05 -05:00
2013-02-20 20:33:05 -05:00
2013-02-22 19:27:56 -05:00
2013-02-21 10:14:42 -05:00
2013-02-22 02:17:50 -05:00
2013-02-20 20:33:05 -05:00

Media Browser

This is the source code for Media Browser Server.

Visit our community:

http://community.mediabrowser.tv/

Description
Languages
C# 99.6%
HTML 0.3%