diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-29 22:20:51 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-29 22:20:51 -0400 |
| commit | bbec002350b7b2e0693f683326c691620cbafd7f (patch) | |
| tree | 76ae38cafea6899691e5a918bc8438ae5e59bd34 /CONTRIBUTORS.md | |
| parent | a5fa31cf94eeeeef0240b45e5b273b855d76be69 (diff) | |
| parent | 27aba90946b2a40f0e2a42f4e42d00881d0a9c23 (diff) | |
Merge branch 'master' of https://github.com/Detector1/MediaBrowser
Conflicts:
CONTRIBUTORS.md
Diffstat (limited to 'CONTRIBUTORS.md')
| -rw-r--r-- | CONTRIBUTORS.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 97707c8a4..8bab28561 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -54,3 +54,4 @@ - [danlotfy] (https://github.com/danlotfy) - [jordy1955] (https://github.com/jordy1955) - [JoshFink] (https://github.com/JoshFink) + - [Detector1](https://github.com/Detector1) |