merging with master to clear merge conflict

Browse Source

...

This commit is contained in:

Phallacy

2019-02-20 00:46:13 -08:00

parent 6bbb968b57 6c6e9ca9f2

commit a0d31a49a0

143 changed files with 3162 additions and 3215 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2435

Emby.Server.Implementations/Library/UserManager.cs

File diff suppressed because it is too large Load Diff