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

Conflicts: CONTRIBUTORS.md
12 years ago · 055515d221
parent f9e84e5c2a 0c3898e9ed
commit 055515d221
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -40,3 +40,4 @@
 - [mrwebsmith](https://github.com/mrwebsmith)
 - [rickster53](https://github.com/rickster53)
 - [Tharnax] (https://github.com/Tharnax)
+ - [0sm0] (https://github.com/0sm0)