Prechádzať zdrojové kódy

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

Conflicts:
	CONTRIBUTORS.md
Luke Pulverenti 11 rokov pred
rodič
commit
bbec002350
1 zmenil súbory, kde vykonal 1 pridanie a 0 odobranie
  1. 1 0
      CONTRIBUTORS.md

+ 1 - 0
CONTRIBUTORS.md

@@ -54,3 +54,4 @@
  - [danlotfy] (https://github.com/danlotfy)
  - [jordy1955] (https://github.com/jordy1955)
  - [JoshFink] (https://github.com/JoshFink)
+ - [Detector1](https://github.com/Detector1)