aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-09-24 11:09:00 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-09-24 11:09:00 -0400
commit04319900f9ac6ebac0668927ddb38212f37477d0 (patch)
treeef8cbc68a8a80150fb9f6a1a645e432274ac416d
parentb49764dbaafbbf11b6308ec675355696b9e58379 (diff)
parent50c58d4cb98cdc1d27cf1da1f4f9f66fb402d42c (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--CONTRIBUTORS.md1
-rw-r--r--MediaBrowser.ServerApplication/Resources/Images/mb3logo800.pngbin35600 -> 28816 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ee6870271..18cef5819 100644
--- 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/)
diff --git a/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png b/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png
index fbc769a6f..12db84679 100644
--- a/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png
+++ b/MediaBrowser.ServerApplication/Resources/Images/mb3logo800.png
Binary files differ