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

Conflicts: CONTRIBUTORS.md
12 years ago · 70844a3b34
parent 716227fd59 8cb4bf9df8
commit 70844a3b34
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -35,4 +35,5 @@
 - [abobader](https://github.com/abobader)
 - [milli260876](https://github.com/milli260876)
 - [vileboy] (https://github.com/vileboy)
- - [starkadius] (https://github.com/starkadius)
+ - [starkadius] (https://github.com/starkadius)
+ - [wraslor](https://github.com/wraslor)