diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-27 22:46:42 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-27 22:46:42 -0400 |
| commit | d83055e4eee5060974b6af48ace96ee15609139f (patch) | |
| tree | 70f45be7a6fb44dcc7d06fdf18cca9ad0d896cf3 | |
| parent | 13198a687df2d3c3c61148bf769649c35bc23b15 (diff) | |
| parent | 5f745613b44155cb0333965984f1dcb0eedfaf93 (diff) | |
Merge branch 'master' of https://github.com/crisliv/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 035939f70..57aecff61 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -42,4 +42,5 @@ - [Tharnax] (https://github.com/Tharnax) - [0sm0] (https://github.com/0sm0) - [swhitmore](https://github.com/swhitmore) - - [DigiTM](https://github.com/DigiTM)
\ No newline at end of file + - [DigiTM](https://github.com/DigiTM) + - [crisliv / xliv](https://github.com/crisliv)
\ No newline at end of file |