diff options
| author | crobibero <cody@robibe.ro> | 2020-06-03 09:38:49 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-06-03 09:38:49 -0600 |
| commit | 88b6c26472ad57822d3ab79a043db259ffcbb0e3 (patch) | |
| tree | 373e34253736a9d70bf252f0d0e2f76a4b66a5ba /MediaBrowser.Controller/Entities/UserViewBuilder.cs | |
| parent | e02cc8da53ff76a17de52a18ad83e73a1caa6394 (diff) | |
| parent | ab4597958afddb91904c29f5583395ab40918dcb (diff) | |
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-channel
# Conflicts:
# Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
Diffstat (limited to 'MediaBrowser.Controller/Entities/UserViewBuilder.cs')
0 files changed, 0 insertions, 0 deletions