mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-16 18:42:52 -07:00
687f17f09a
Conflicts: MediaBrowser.Api/System/SystemService.cs |
||
---|---|---|
.. | ||
Properties | ||
FodyWeavers.xml | ||
MediaBrowser.Model.net35.csproj | ||
MediaBrowser.Model.snk |