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

Conflicts: CONTRIBUTORS.md
11 years ago · 98169502d1
parent 76529eec83 ed05a0ca78
commit 98169502d1
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -45,4 +45,5 @@
 - [DigiTM](https://github.com/DigiTM)
 - [crisliv / xliv](https://github.com/crisliv)
 - [Yogi](https://github.com/yogi12)
- - [madFloyd] (https://github.com/madFloyd)
+ - [madFloyd] (https://github.com/madFloyd)
+ - [yardameus] (https://github.com/yardameus)