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

Conflicts: CONTRIBUTORS.md
12 years ago · f9e84e5c2a
parent de1d24dd6d 59010fb98a
commit f9e84e5c2a
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -39,3 +39,4 @@
 - [wraslor](https://github.com/wraslor)
 - [mrwebsmith](https://github.com/mrwebsmith)
 - [rickster53](https://github.com/rickster53)
+ - [Tharnax] (https://github.com/Tharnax)