Erwin de Haan
49b61f238e
Merge branch 'dev' into reformat
# Conflicts:
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
# Emby.Server.Implementations/LiveTv/LiveTvManager.cs
# Emby.Server.Implementations/Security/MBLicenseFile.cs
# Emby.Server.Implementations/Security/PluginSecurityManager.cs
# Emby.Server.Implementations/Security/RegRecord.cs
# MediaBrowser.Api/PluginService.cs
# MediaBrowser.Api/System/SystemService.cs
# MediaBrowser.Common/Security/IRequiresRegistration.cs
# MediaBrowser.Common/Security/ISecurityManager.cs
# MediaBrowser.Common/Security/PaymentRequiredException.cs
# MediaBrowser.Model/Entities/MBRegistrationRecord.cs
# MediaBrowser.Model/Entities/PluginSecurityInfo.cs
# deployment/win-generic/build-jellyfin.ps1
2019-01-15 17:34:39 +01:00
..
2019-01-13 21:37:13 +01:00
2019-01-13 21:37:13 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:37:13 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:46:33 +01:00
2019-01-15 17:34:39 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:59:37 +01:00
2019-01-13 21:46:33 +01:00
2019-01-15 17:34:39 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 20:22:00 +01:00
2019-01-13 21:37:13 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 21:37:13 +01:00
2019-01-11 12:50:36 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:46:33 +01:00
2019-01-15 17:34:39 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 21:37:13 +01:00
2019-01-13 21:46:33 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 21:37:13 +01:00
2019-01-13 20:23:38 +01:00
2019-01-15 17:34:39 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-15 17:34:39 +01:00
2019-01-13 21:10:15 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00