Merge branch 'master' of https://github.com/Yogi12/MediaBrowser

Conflicts: CONTRIBUTORS.md
11 years ago · b19d0a14d3
parent d83055e4ee bbd0f31ea1
commit b19d0a14d3
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -43,4 +43,5 @@
 - [0sm0] (https://github.com/0sm0)
 - [swhitmore](https://github.com/swhitmore)
 - [DigiTM](https://github.com/DigiTM)
- - [crisliv / xliv](https://github.com/crisliv)
+ - [crisliv / xliv](https://github.com/crisliv)
+ - [Yogi](https://github.com/yogi12)