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

11 years ago · 04319900f9
parent b49764dbaa 50c58d4cb9
commit 04319900f9
2 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -57,3 +57,4 @@
 - [Detector1](https://github.com/Detector1)
 - [BlackIce013](https://github.com/blackice013)
 - [mporcas] (https://github.com/mporcas)
 - [tikuf] (https://github.com/tikuf/)
--- a/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png
+++ b/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png