diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-22 19:26:38 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-22 19:26:38 -0500 |
| commit | 84507736a0f8f60c849bfae54b1695b0cb2c091a (patch) | |
| tree | 6d923baae2dfc21769c27aef2f3b6c44d31d7567 /.gitignore | |
| parent | a2d215b6ae9d594d71a679a464c9c6a559efe862 (diff) | |
| parent | 4a46612c3f7660f58bef695027c1c0492c4ef5f5 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3fbadb705..d673b0d96 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,7 @@ publish/ # NuGet Packages Directory ## TODO: If you have NuGet Package Restore enabled, uncomment the next line packages/ +dlls/ # Windows Azure Build Output csx |