diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-28 10:00:28 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-28 10:00:28 -0400 |
| commit | 98169502d1532f2882bbe92e516a60413d614be9 (patch) | |
| tree | 75571e66c608649452e4ced33efd74f82bed02eb /CONTRIBUTORS.md | |
| parent | 76529eec83e0e4b54a60671a33ee790ed086efc2 (diff) | |
| parent | ed05a0ca788b646ce348565c66972aa3f411b587 (diff) | |
Merge branch 'master' of https://github.com/yardameus/MediaBrowser
Conflicts:
CONTRIBUTORS.md
Diffstat (limited to 'CONTRIBUTORS.md')
| -rw-r--r-- | CONTRIBUTORS.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index cd9ed9ef3..8b3995c18 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -45,4 +45,5 @@ - [DigiTM](https://github.com/DigiTM) - [crisliv / xliv](https://github.com/crisliv) - [Yogi](https://github.com/yogi12) - - [madFloyd] (https://github.com/madFloyd)
\ No newline at end of file + - [madFloyd] (https://github.com/madFloyd) + - [yardameus] (https://github.com/yardameus)
\ No newline at end of file |