diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-27 22:47:55 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-27 22:47:55 -0400 |
| commit | b19d0a14d3f9ff97df74423b58a34fcc558be8ad (patch) | |
| tree | dcbd8c2975ee5587a18899bf03d27673d86a1ffa | |
| parent | d83055e4eee5060974b6af48ace96ee15609139f (diff) | |
| parent | bbd0f31ea1ce0d2c03cc7b408490cd90b9baa9f5 (diff) | |
Merge branch 'master' of https://github.com/Yogi12/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 57aecff61..5867e8e26 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -43,4 +43,5 @@ - [0sm0] (https://github.com/0sm0) - [swhitmore](https://github.com/swhitmore) - [DigiTM](https://github.com/DigiTM) - - [crisliv / xliv](https://github.com/crisliv)
\ No newline at end of file + - [crisliv / xliv](https://github.com/crisliv) + - [Yogi](https://github.com/yogi12)
\ No newline at end of file |