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
..
Api	Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev	2015-05-07 19:12:56 +02:00
Properties	added a master version file	2013-02-22 02:17:50 -05:00
MediaBrowser.WebDashboard.csproj	Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev	2015-05-07 19:12:56 +02:00
packages.config	updated image magick	2015-04-06 16:55:37 -04:00
ServerEntryPoint.cs	removed plugin configuration pages from the kernel	2013-03-04 23:34:00 -05:00