diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-25 11:15:29 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-25 11:15:29 -0400 |
| commit | 716227fd59b2b2c49783b97983c2d89c1a44ac75 (patch) | |
| tree | 3986c751d9e619712174a121c3e4195ffa42e517 /CONTRIBUTORS.md | |
| parent | a5bdf11991a7baa9fd35a0bcfae2a353a0d11b2a (diff) | |
| parent | a9b097f59be58388fdff31a4c1de732f1d66fdde (diff) | |
Merge branch 'master' of https://github.com/starkadius/MediaBrowser
Conflicts:
CONTRIBUTORS.md
Diffstat (limited to 'CONTRIBUTORS.md')
| -rw-r--r-- | CONTRIBUTORS.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 622bca61f..55b96cdc0 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -34,4 +34,5 @@ - [pjrollo2000](https://github.com/pjrollo2000) - [abobader](https://github.com/abobader) - [milli260876](https://github.com/milli260876) - - [vileboy] (https://github.com/vileboy)
\ No newline at end of file + - [vileboy] (https://github.com/vileboy) + - [starkadius] (https://github.com/starkadius)
\ No newline at end of file |