diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:09:58 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:09:58 -0400 |
| commit | fa6de05d3fed91b3fe2f0b183e42bbceaedc2f06 (patch) | |
| tree | c24c2fcae04fb4fb4fe55d0db96c783fff9c2e71 | |
| parent | 79a82ae671628f73a6dacd5063667ff87900435d (diff) | |
| parent | dac3de818f95f12b922d5495cd4c7024533dd218 (diff) | |
Merge branch 'master' of https://github.com/brocass/MediaBrowser
Conflicts:
CONTRIBUTORS.md
| -rw-r--r-- | CONTRIBUTORS.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f169aff55..c6ca1fd9e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -30,3 +30,4 @@ - [aspdend] (https://github.com/aspdend) - [RedshirtMB](https://github.com/RedshirtMB) - [thealienamongus](https://github.com/thealienamongus) + - [brocass](https://github.com/brocass) |