diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-23 23:49:38 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-23 23:49:38 -0400 |
| commit | def2b00c9894d32e00e34487a9b2494847976ff5 (patch) | |
| tree | 40b87277611398dba7c984687f6c182024d12005 | |
| parent | 19e04cdfaff2052d40a609fcc46386c81a5f3185 (diff) | |
| parent | dd64d54ca11a7ff270fc88187753bb2e06b0986b (diff) | |
Merge branch 'master' of https://github.com/RedshirtMB/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 135647bf5..cf0d1af41 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -27,4 +27,5 @@ - [brainfryd] (https://github.com/brainfryd) - [DGMayor] (http://github.com/DGMayor) - [Jon-theHTPC] (https://github.com/Jon-theHTPC) - - [aspdend] (https://github.com/aspdend)
\ No newline at end of file + - [aspdend] (https://github.com/aspdend) + - [RedshirtMB](https://github.com/RedshirtMB)
\ No newline at end of file |