Explorar o código

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

Conflicts:
	CONTRIBUTORS.md
Luke Pulverenti %!s(int64=12) %!d(string=hai) anos
pai
achega
055515d221
Modificáronse 1 ficheiros con 1 adicións e 0 borrados
  1. 1 0
      CONTRIBUTORS.md

+ 1 - 0
CONTRIBUTORS.md

@@ -40,3 +40,4 @@
  - [mrwebsmith](https://github.com/mrwebsmith)
  - [rickster53](https://github.com/rickster53)
  - [Tharnax] (https://github.com/Tharnax)
+ - [0sm0] (https://github.com/0sm0)