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

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