diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-23 23:48:27 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-23 23:48:27 -0400 |
| commit | 19e04cdfaff2052d40a609fcc46386c81a5f3185 (patch) | |
| tree | 769fc4d71c8dddc6602a0a841a4ef0eefa874a3a | |
| parent | 5850c7067d9db430383d57890368c16465ca78d6 (diff) | |
| parent | 096034179e31d7aaddd13910c45135a1a4e75358 (diff) | |
Merge branch 'master' of https://github.com/aspdend/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 aa27c2488..135647bf5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -26,4 +26,5 @@ - [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 + - [Jon-theHTPC] (https://github.com/Jon-theHTPC) + - [aspdend] (https://github.com/aspdend)
\ No newline at end of file |