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