Merge branch 'master' of https://github.com/crisliv/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
d83055e4ee
|
@ -42,4 +42,5 @@
|
|||
- [Tharnax] (https://github.com/Tharnax)
|
||||
- [0sm0] (https://github.com/0sm0)
|
||||
- [swhitmore](https://github.com/swhitmore)
|
||||
- [DigiTM](https://github.com/DigiTM)
|
||||
- [DigiTM](https://github.com/DigiTM)
|
||||
- [crisliv / xliv](https://github.com/crisliv)
|
Loading…
Reference in New Issue
Block a user