瀏覽代碼

Merge branch 'master' of https://github.com/Tharnax/MediaBrowser

Conflicts:
	CONTRIBUTORS.md
Luke Pulverenti 11 年之前
父節點
當前提交
f9e84e5c2a
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      CONTRIBUTORS.md

+ 1 - 0
CONTRIBUTORS.md

@@ -39,3 +39,4 @@
  - [wraslor](https://github.com/wraslor)
  - [wraslor](https://github.com/wraslor)
  - [mrwebsmith](https://github.com/mrwebsmith)
  - [mrwebsmith](https://github.com/mrwebsmith)
  - [rickster53](https://github.com/rickster53)
  - [rickster53](https://github.com/rickster53)
+ - [Tharnax] (https://github.com/Tharnax)