diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-26 08:10:13 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-26 08:10:13 -0400 |
| commit | 055515d221a400597bf0ffb7a5ac4e33d52b3929 (patch) | |
| tree | fcd8a5deaec6fda5edc785e2464ead0c346b05f0 | |
| parent | f9e84e5c2a49fd64f00dd070b3640fbdcd278813 (diff) | |
| parent | 0c3898e9ed521e85170dc04601e6787d60b42296 (diff) | |
Merge branch 'master' of https://github.com/0sm0/MediaBrowser
Conflicts:
CONTRIBUTORS.md
| -rw-r--r-- | CONTRIBUTORS.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 002ee8760..e04685af7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -40,3 +40,4 @@ - [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 |