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

Conflicts: CONTRIBUTORS.md
11 years ago · 779bc6baf5
parent 5e00f9f059 80d88ecf60
commit 779bc6baf5
1 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -41,3 +41,4 @@
 - [rickster53](https://github.com/rickster53)
 - [Tharnax] (https://github.com/Tharnax)
 - [0sm0] (https://github.com/0sm0)
 - [swhitmore](https://github.com/swhitmore)