diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:13:17 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:13:17 -0400 |
| commit | e51b577732df3f27c9836f208e4bbd43387df7b5 (patch) | |
| tree | 3bb985b45a359a9650bbbaa4b3ab2853c2371911 | |
| parent | 1a6065d2cb0348957ce3ec3fbf2adfd63732677f (diff) | |
| parent | b37d75dca4c1d32afca0f554a2725c1601e1db3e (diff) | |
Merge branch 'master' of https://github.com/abobader/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 5c7d83264..f3003c159 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -31,4 +31,5 @@ - [RedshirtMB](https://github.com/RedshirtMB) - [thealienamongus](https://github.com/thealienamongus) - [brocass](https://github.com/brocass) - - [pjrollo2000](https://github.com/pjrollo2000)
\ No newline at end of file + - [pjrollo2000](https://github.com/pjrollo2000) + - [abobader](https://github.com/abobader)
\ No newline at end of file |