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

Conflicts: CONTRIBUTORS.md
11 years ago · bf4ee62157
parent 4a5831adb6 897c9ce2cb
commit bf4ee62157
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -41,4 +41,5 @@
 - [rickster53](https://github.com/rickster53)
 - [Tharnax] (https://github.com/Tharnax)
 - [0sm0] (https://github.com/0sm0)
- - [swhitmore](https://github.com/swhitmore)
+ - [swhitmore](https://github.com/swhitmore)
+ - [DigiTM](https://github.com/DigiTM)