diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:10:36 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:10:36 -0400 |
| commit | 1a6065d2cb0348957ce3ec3fbf2adfd63732677f (patch) | |
| tree | d111ee65d61fd4a255805b28b2c061fc76dce3c5 | |
| parent | fa6de05d3fed91b3fe2f0b183e42bbceaedc2f06 (diff) | |
| parent | b9dfe3010a325adb96875ad8a764b49ed73f9820 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/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 c6ca1fd9e..5c7d83264 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -31,3 +31,4 @@ - [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 |