Sfoglia il codice sorgente

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

Conflicts:
	CONTRIBUTORS.md
Luke Pulverenti 11 anni fa
parent
commit
f9e84e5c2a
1 ha cambiato i file con 1 aggiunte e 0 eliminazioni
  1. 1 0
      CONTRIBUTORS.md

+ 1 - 0
CONTRIBUTORS.md

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