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

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