diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-23 23:46:59 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-23 23:46:59 -0400 |
| commit | 5850c7067d9db430383d57890368c16465ca78d6 (patch) | |
| tree | 0a5d0d4c4ec5298b2d0837bc6a8b331cd59710c3 | |
| parent | 9e19101f25efe69a297ad8fab8823992b9027333 (diff) | |
| parent | 5c0a8e31a44340f80fba37ed5c90d2f4fbfa451d (diff) | |
Merge branch 'master' of https://github.com/Jon-theHTPC/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 0fefe6b924..aa27c2488e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -26,3 +26,4 @@ - [doron1] (https://github.com/doron1) - [brainfryd] (https://github.com/brainfryd) - [DGMayor] (http://github.com/DGMayor) + - [Jon-theHTPC] (https://github.com/Jon-theHTPC)
\ No newline at end of file |