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

Conflicts: CONTRIBUTORS.md
11 years ago · e51b577732
parent 1a6065d2cb b37d75dca4
commit e51b577732
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -31,4 +31,5 @@
 - [RedshirtMB](https://github.com/RedshirtMB)
 - [thealienamongus](https://github.com/thealienamongus)
 - [brocass](https://github.com/brocass)
- - [pjrollo2000](https://github.com/pjrollo2000)
+ - [pjrollo2000](https://github.com/pjrollo2000)
+ - [abobader](https://github.com/abobader)