Explorar o código

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

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

+ 2 - 1
CONTRIBUTORS.md

@@ -44,4 +44,5 @@
  - [swhitmore](https://github.com/swhitmore)
  - [DigiTM](https://github.com/DigiTM)
  - [crisliv / xliv](https://github.com/crisliv)
- - [Yogi](https://github.com/yogi12)
+ - [Yogi](https://github.com/yogi12)
+ - [madFloyd] (https://github.com/madFloyd)