jellyfin/MediaBrowser.Server.Implementations
Luke Pulverenti 1cdb420d2e Merge branch 'beta' into dev
Conflicts:
	MediaBrowser.Api/StartupWizardService.cs
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
	MediaBrowser.Server.Implementations/Dto/DtoService.cs
	MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
	MediaBrowser.Server.Implementations/Library/LibraryManager.cs
	MediaBrowser.Server.Implementations/Localization/Core/ca.json
	MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
	MediaBrowser.Server.Implementations/packages.config
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json
	SharedVersion.cs
2016-02-01 22:21:58 -05:00
..
2014-10-01 20:28:16 -04:00
2016-02-01 22:21:58 -05:00
2015-11-14 11:58:01 -05:00
2016-01-29 00:17:35 -05:00
2016-01-26 13:20:18 -05:00
2016-01-21 11:58:07 -05:00
2016-01-30 13:49:50 -05:00
2016-01-30 13:50:51 -05:00
2016-02-01 14:54:49 -05:00
2015-12-14 12:16:54 -05:00
2016-02-01 12:03:07 -05:00
2016-02-01 22:21:58 -05:00
2016-02-01 21:40:48 -05:00
2015-01-16 23:38:24 -05:00
2015-12-09 11:59:23 -05:00
2016-01-30 13:49:12 -05:00
2015-09-19 22:06:56 -04:00
2016-02-01 14:54:49 -05:00
2015-12-03 12:03:47 -05:00
2015-11-11 09:56:31 -05:00
2013-02-24 16:53:54 -05:00
2016-01-19 22:03:57 -05:00
2015-11-11 09:56:31 -05:00
2015-07-02 01:08:05 -04:00
2015-07-14 15:04:16 -04:00
2015-11-11 09:56:31 -05:00
2015-05-16 23:17:23 -04:00
2015-12-03 12:03:47 -05:00
2014-11-07 11:15:02 -05:00
2016-02-01 21:41:00 -05:00