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

Conflicts: CONTRIBUTORS.md
12 years ago · fa6de05d3f
parent 79a82ae671 dac3de818f
commit fa6de05d3f
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -30,3 +30,4 @@
 - [aspdend] (https://github.com/aspdend)
 - [RedshirtMB](https://github.com/RedshirtMB)
 - [thealienamongus](https://github.com/thealienamongus)
+ - [brocass](https://github.com/brocass)