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

Conflicts: CONTRIBUTORS.md
11 years ago · d83055e4ee
parent 13198a687d 5f745613b4
commit d83055e4ee
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -42,4 +42,5 @@
 - [Tharnax] (https://github.com/Tharnax)
 - [0sm0] (https://github.com/0sm0)
 - [swhitmore](https://github.com/swhitmore)
- - [DigiTM](https://github.com/DigiTM)
+ - [DigiTM](https://github.com/DigiTM)
+ - [crisliv / xliv](https://github.com/crisliv)