No description
Find a file
Luke Pulverenti 1784c702e6 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
	MediaBrowser.Model/IO/IZipClient.cs
2014-12-28 23:13:03 -05:00
dashboard-ui Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-12-28 23:13:03 -05:00
app.config remove tasks from startup 2014-11-28 12:41:47 -05:00
packages.config remove tasks from startup 2014-11-28 12:41:47 -05:00