diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-26 11:17:48 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-26 11:17:48 -0400 |
| commit | 779bc6baf536ba3e4895430994533a06d1fe65b5 (patch) | |
| tree | 8e471806ae481a244d9a75ee72ebe588e0aa948e | |
| parent | 5e00f9f05965091ce9edb802584eaae2843b67df (diff) | |
| parent | 80d88ecf600b7431fd070d8c8d2dd702253194c3 (diff) | |
Merge branch 'master' of https://github.com/swhitmore/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 e04685af7..f80760136 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -40,4 +40,5 @@ - [mrwebsmith](https://github.com/mrwebsmith) - [rickster53](https://github.com/rickster53) - [Tharnax] (https://github.com/Tharnax) - - [0sm0] (https://github.com/0sm0)
\ No newline at end of file + - [0sm0] (https://github.com/0sm0) + - [swhitmore](https://github.com/swhitmore)
\ No newline at end of file |