Merge branch 'master' of https://github.com/Tharnax/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
f9e84e5c2a
|
@ -39,3 +39,4 @@
|
||||||
- [wraslor](https://github.com/wraslor)
|
- [wraslor](https://github.com/wraslor)
|
||||||
- [mrwebsmith](https://github.com/mrwebsmith)
|
- [mrwebsmith](https://github.com/mrwebsmith)
|
||||||
- [rickster53](https://github.com/rickster53)
|
- [rickster53](https://github.com/rickster53)
|
||||||
|
- [Tharnax] (https://github.com/Tharnax)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user