Commit graph

9 commits

Author SHA1 Message Date
Joshua Boniface 384f867228 Update changelogs to include this PR 2019-01-21 12:57:46 -05:00
Joshua Boniface ff4cbfc6df Fix inconsistencies in changelogs 2019-01-21 00:02:56 -05:00
Joshua Boniface 73038ee3f7 Bump version to 10.1.0 2019-01-20 23:39:55 -05:00
Joshua Boniface d42ef36bf9 Correct invalid changelog entry 2019-01-19 16:44:55 -05:00
Erwin de Haan d116efe1f7 Merge branch 'dev' into reformat 2019-01-18 17:04:01 +01:00
Joshua Boniface b30d702782 Merge branch 'master' into dev 2019-01-15 22:29:22 -05:00
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
Erwin de Haan 0bb08b3f8d Added debian bin folder. 2019-01-11 23:35:14 +01:00
Erwin de Haan 399a079dd4 Build scripts and build system consolidation.
Squashed commit.
2019-01-10 19:45:30 +01:00