diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-28 07:42:39 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-28 07:42:39 -0400 |
| commit | 76529eec83e0e4b54a60671a33ee790ed086efc2 (patch) | |
| tree | 1e014558b663d869da221751de8c63852a20fc1d | |
| parent | ef7f5622359e2b46a0c8ff32c919729f577e046c (diff) | |
| parent | 6b9d68d54d84966d353d22b5556d1fc6b95acf8e (diff) | |
Merge branch 'master' of https://github.com/madFloyd/MediaBrowser
Conflicts:
CONTRIBUTORS.md
| -rw-r--r-- | CONTRIBUTORS.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 5867e8e26..cd9ed9ef3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -44,4 +44,5 @@ - [swhitmore](https://github.com/swhitmore) - [DigiTM](https://github.com/DigiTM) - [crisliv / xliv](https://github.com/crisliv) - - [Yogi](https://github.com/yogi12)
\ No newline at end of file + - [Yogi](https://github.com/yogi12) + - [madFloyd] (https://github.com/madFloyd)
\ No newline at end of file |