| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Bond-009 <bond.009@outlook.com>
|
|
|
|
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Removed Using directives that are not required
|
|
|
|
|
|
|
|
|
|
|
|
merge from master
|