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

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