mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-23 22:21:04 +02:00
687f17f09a
Conflicts: MediaBrowser.Api/System/SystemService.cs |
||
---|---|---|
.. | ||
ActivityLogService.cs | ||
ActivityLogWebSocketListener.cs | ||
SystemInfoWebSocketListener.cs | ||
SystemService.cs |