Tavares André 64b8be1b39 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev ... Conflicts: MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj		2015-04-20 19:07:29 +02:00
..
ConfigurationPageInfo.cs	display sync services	2015-03-08 13:58:45 -04:00
DashboardService.cs	separate provider options	2015-01-18 00:45:10 -05:00
PackageCreator.cs	Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev	2015-04-20 19:07:29 +02:00