diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-26 08:09:29 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-26 08:09:29 -0400 |
| commit | f9e84e5c2a49fd64f00dd070b3640fbdcd278813 (patch) | |
| tree | d55412b280cdb0330800be230195f5710f9ca81b | |
| parent | de1d24dd6d4696f81411e8c3777736cf82565082 (diff) | |
| parent | 59010fb98a0a41241942f1ce6c3760dc76338246 (diff) | |
Merge branch 'master' of https://github.com/Tharnax/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 549601d3a..002ee8760 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -39,3 +39,4 @@ - [wraslor](https://github.com/wraslor) - [mrwebsmith](https://github.com/mrwebsmith) - [rickster53](https://github.com/rickster53) + - [Tharnax] (https://github.com/Tharnax) |