diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 12:47:51 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 12:47:51 -0400 |
| commit | a5bdf11991a7baa9fd35a0bcfae2a353a0d11b2a (patch) | |
| tree | 51f16f629a1e598e5b4d6f2227a83a6d4b68872c | |
| parent | 5d2dc5bd1045434ae05e02f5512b36b75d375596 (diff) | |
| parent | 99911649c27a0fe9e9ab126936f397bb357e6679 (diff) | |
Merge branch 'master' of https://github.com/vileboy/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 1fbb2e376..622bca61f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -33,4 +33,5 @@ - [brocass](https://github.com/brocass) - [pjrollo2000](https://github.com/pjrollo2000) - [abobader](https://github.com/abobader) - - [milli260876](https://github.com/milli260876)
\ No newline at end of file + - [milli260876](https://github.com/milli260876) + - [vileboy] (https://github.com/vileboy)
\ No newline at end of file |