michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,874 Commits 2 Branches 79 Tags 73 MiB
eb4b705167
Commit Graph

3 Commits

Author SHA1 Message Date
Phallacy
a30687a15a Quick fix to erroring build scripts and pulling the supported ffmpeg 2019-01-23 00:41:38 -08: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
399a079dd4 Build scripts and build system consolidation. 
Squashed commit.
 2019-01-10 19:45:30 +01:00