diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-27 11:15:36 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-27 11:15:36 -0400 |
| commit | bf4ee62157702cf8d37d16cb2cde4815b1f86e50 (patch) | |
| tree | dc120603b5c34373d5530329eb4eece242707f89 /CONTRIBUTORS.md | |
| parent | 4a5831adb61ffca09480b2aa133c3ecbcff946c7 (diff) | |
| parent | 897c9ce2cb75758620e405dce6c133213276483f (diff) | |
Merge branch 'master' of https://github.com/DigiTM/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 f80760136..035939f70 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -41,4 +41,5 @@ - [rickster53](https://github.com/rickster53) - [Tharnax] (https://github.com/Tharnax) - [0sm0] (https://github.com/0sm0) - - [swhitmore](https://github.com/swhitmore)
\ No newline at end of file + - [swhitmore](https://github.com/swhitmore) + - [DigiTM](https://github.com/DigiTM)
\ No newline at end of file |