Merge branch 'master' of https://github.com/Jon-theHTPC/MediaBrowser

Conflicts: CONTRIBUTORS.md
12 years ago · 5850c7067d
parent 9e19101f25 5c0a8e31a4
commit 5850c7067d
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -26,3 +26,4 @@
 - [doron1] (https://github.com/doron1)
 - [brainfryd] (https://github.com/brainfryd)
 - [DGMayor] (http://github.com/DGMayor)
+ - [Jon-theHTPC] (https://github.com/Jon-theHTPC)