Merge branch 'master' of https://github.com/0sm0/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
055515d221
|
@ -40,3 +40,4 @@
|
||||||
- [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)
|
- [Tharnax] (https://github.com/Tharnax)
|
||||||
|
- [0sm0] (https://github.com/0sm0)
|
Loading…
Reference in New Issue
Block a user