Tavares André 48e7ca8725 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev ...

Conflicts:
	MediaBrowser.Server.Implementations/Localization/Server/server.json

2015-05-07 19:12:56 +02:00

..

ConfigurationPageInfo.cs

display sync services

2015-03-08 13:58:45 -04:00

DashboardService.cs

adjust startup sequences

2015-05-02 12:34:27 -04:00

PackageCreator.cs

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

2015-05-07 19:12:56 +02:00