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

Conflicts: CONTRIBUTORS.md
11 years ago · bbec002350
parent a5fa31cf94 27aba90946
commit bbec002350
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -54,3 +54,4 @@
 - [danlotfy] (https://github.com/danlotfy)
 - [jordy1955] (https://github.com/jordy1955)
 - [JoshFink] (https://github.com/JoshFink)
+ - [Detector1](https://github.com/Detector1)