diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-25 11:16:31 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-08-25 11:16:31 -0400 |
| commit | 70844a3b344ce0cd7aa74c1854a28053aa7a40e8 (patch) | |
| tree | a4f481bbeb8541b65e96876169830ca6d9459ad7 | |
| parent | 716227fd59b2b2c49783b97983c2d89c1a44ac75 (diff) | |
| parent | 8cb4bf9df86b99ba3a439c29a30cc253b15994c8 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/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 55b96cdc0..a3b264337 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -35,4 +35,5 @@ - [abobader](https://github.com/abobader) - [milli260876](https://github.com/milli260876) - [vileboy] (https://github.com/vileboy) - - [starkadius] (https://github.com/starkadius)
\ No newline at end of file + - [starkadius] (https://github.com/starkadius) + - [wraslor](https://github.com/wraslor)
\ No newline at end of file |