Commit Graph

4 Commits

Author SHA1 Message Date
Luke Pulverenti c48458f215 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	SharedVersion.cs
2014-12-01 13:42:07 -05:00
Luke Pulverenti dc8fb33a1f updated nuget 2014-12-01 07:43:34 -05:00
Luke Pulverenti 2df4273ee0 consolidate os display name 2014-11-23 18:10:41 -05:00
Luke Pulverenti 234dba2d9a move usage reporter to server project 2014-09-06 16:09:35 -04:00