Conflicts: Mvc.sln src/Microsoft.AspNet.Mvc.Core/Formatters/TempInputFormatterProvider.cs src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvokerProvider.cs src/Microsoft.AspNet.Mvc/MvcServices.cs test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs Conflicts: src/Microsoft.AspNet.Mvc.Core/Formatters/TempInputFormatterProvider.cs |
||
|---|---|---|
| .. | ||
| Microsoft.AspNet.Mvc.Core.Test | ||
| Microsoft.AspNet.Mvc.FunctionalTests | ||
| Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test | ||
| Microsoft.AspNet.Mvc.ModelBinding.Test | ||
| Microsoft.AspNet.Mvc.Razor.Host.Test | ||
| Microsoft.AspNet.Mvc.Razor.Test | ||
| Microsoft.AspNet.Mvc.Test | ||
| WebSites | ||