Merge branch 'master' of https://github.com/0sm0/MediaBrowser · 055515d221 - Gogs

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

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti 11 years ago

parent

f9e84e5c2a 0c3898e9ed

commit

055515d221

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

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