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

Conflicts: CONTRIBUTORS.md
12 years ago · 19e04cdfaf
parent 5850c7067d 096034179e
commit 19e04cdfaf
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -26,4 +26,5 @@
 - [doron1] (https://github.com/doron1)
 - [brainfryd] (https://github.com/brainfryd)
 - [DGMayor] (http://github.com/DGMayor)
- - [Jon-theHTPC] (https://github.com/Jon-theHTPC)
+ - [Jon-theHTPC] (https://github.com/Jon-theHTPC)
+ - [aspdend] (https://github.com/aspdend)