diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:14:13 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-24 09:14:13 -0400 |
| commit | 5d2dc5bd1045434ae05e02f5512b36b75d375596 (patch) | |
| tree | 4e31e713268e2f6383b082beb2e509cde0cd0671 | |
| parent | e51b577732df3f27c9836f208e4bbd43387df7b5 (diff) | |
| parent | ccdc6a64b7d2425abbdb284d92ac833ee722619b (diff) | |
Merge branch 'master' of https://github.com/milli260876/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 f3003c159..1fbb2e376 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -32,4 +32,5 @@ - [thealienamongus](https://github.com/thealienamongus) - [brocass](https://github.com/brocass) - [pjrollo2000](https://github.com/pjrollo2000) - - [abobader](https://github.com/abobader)
\ No newline at end of file + - [abobader](https://github.com/abobader) + - [milli260876](https://github.com/milli260876)
\ No newline at end of file |