<feed xmlns='http://www.w3.org/2005/Atom'>
<title>jellyfin/deployment/win-generic, branch v10.0.1</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<id>https://git.b0n.dev/jellyfin/atom?h=v10.0.1</id>
<link rel='self' href='https://git.b0n.dev/jellyfin/atom?h=v10.0.1'/>
<link rel='alternate' type='text/html' href='https://git.b0n.dev/jellyfin/'/>
<updated>2019-01-23T08:41:38Z</updated>
<entry>
<title>Quick fix to erroring build scripts and pulling the supported ffmpeg</title>
<updated>2019-01-23T08:41:38Z</updated>
<author>
<name>Phallacy</name>
<email>Dragoonmac@gmail.com</email>
</author>
<published>2019-01-23T08:41:38Z</published>
<link rel='alternate' type='text/html' href='https://git.b0n.dev/jellyfin/commit/?id=a30687a15ae216f027d21813a32aab41b987eea8'/>
<id>urn:sha1:a30687a15ae216f027d21813a32aab41b987eea8</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Move dotnet to a per-platform dependency</title>
<updated>2019-01-20T17:34:52Z</updated>
<author>
<name>Joshua Boniface</name>
<email>joshua@boniface.me</email>
</author>
<published>2019-01-20T17:33:15Z</published>
<link rel='alternate' type='text/html' href='https://git.b0n.dev/jellyfin/commit/?id=3320d4feeb22b2015c26a17309818465cf7272b0'/>
<id>urn:sha1:3320d4feeb22b2015c26a17309818465cf7272b0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'dev' into reformat</title>
<updated>2019-01-15T16:34:39Z</updated>
<author>
<name>Erwin de Haan</name>
<email>EraYaN@users.noreply.github.com</email>
</author>
<published>2019-01-15T16:34:39Z</published>
<link rel='alternate' type='text/html' href='https://git.b0n.dev/jellyfin/commit/?id=49b61f238e634e8b2ed4af8a3e0036080cd023a6'/>
<id>urn:sha1:49b61f238e634e8b2ed4af8a3e0036080cd023a6</id>
<content type='text'>
# 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
</content>
</entry>
<entry>
<title>Build scripts and build system consolidation.</title>
<updated>2019-01-10T18:45:30Z</updated>
<author>
<name>Erwin de Haan</name>
<email>EraYaN@users.noreply.github.com</email>
</author>
<published>2019-01-10T18:45:21Z</published>
<link rel='alternate' type='text/html' href='https://git.b0n.dev/jellyfin/commit/?id=399a079dd472a0ad424884eb48a0d9e471a95c70'/>
<id>urn:sha1:399a079dd472a0ad424884eb48a0d9e471a95c70</id>
<content type='text'>
Squashed commit.
</content>
</entry>
</feed>
