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

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