687f17f09a
Conflicts: MediaBrowser.Api/System/SystemService.cs |
||
---|---|---|
.. | ||
Properties | ||
app.config | ||
Fody.targets | ||
FodyWeavers.xml | ||
MediaBrowser.Model.Portable.csproj | ||
packages.config |
687f17f09a
Conflicts: MediaBrowser.Api/System/SystemService.cs |
||
---|---|---|
.. | ||
Properties | ||
app.config | ||
Fody.targets | ||
FodyWeavers.xml | ||
MediaBrowser.Model.Portable.csproj | ||
packages.config |