jellyfin/MediaBrowser.Api
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
..
2014-12-12 22:56:30 -05:00
2015-02-01 00:07:03 -05:00
2015-05-04 10:35:38 -04:00
2015-05-04 10:35:38 -04:00
2015-04-26 00:39:40 -04:00
2015-04-09 17:11:57 -04:00
2015-05-04 13:44:25 -04:00
2013-02-22 02:17:50 -05:00
2015-04-10 22:43:30 -04:00
2015-04-28 09:56:57 -04:00
2014-12-26 14:34:39 -05:00
2015-04-20 14:35:33 -04:00
2015-04-09 17:11:57 -04:00
2014-08-17 01:38:13 -04:00
2015-03-17 11:57:06 -04:00
2014-12-16 00:46:54 -05:00
2015-04-09 17:11:57 -04:00
2015-01-25 01:34:50 -05:00
2015-01-24 14:03:55 -05:00
2015-03-14 11:38:16 -04:00
2015-03-15 21:48:25 -04:00
2014-03-23 16:07:02 -04:00
2015-01-24 14:03:55 -05:00
2015-03-12 22:47:52 -04:00
2015-03-13 13:25:28 -04:00
2015-04-09 17:11:57 -04:00
2015-02-18 00:01:13 -05:00
2015-01-27 17:45:59 -05:00