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

Conflicts: CONTRIBUTORS.md
11 years ago · 716227fd59
parent a5bdf11991 a9b097f59b
commit 716227fd59
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -35,3 +35,4 @@
 - [abobader](https://github.com/abobader)
 - [milli260876](https://github.com/milli260876)
 - [vileboy] (https://github.com/vileboy)
 - [starkadius] (https://github.com/starkadius)