lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 09:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.10.x' into dev

Browse Source 
# Conflicts:
#	Orchard.proj
This commit is contained in:
Daniel Stolt
2016-04-14 19:06:06 +02:00
parent a4d476e58f be323ab608
commit ef6c7b4d3f
38 changed files with 209 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Tests/Orchard.Framework.Tests.csproj
View File

@@ -320,7 +320,6 @@
<Compile Include="Localization\DateTimePartsTests.cs" />
<Compile Include="Localization\DefaultDateLocalizationServicesTests.cs" />
<Compile Include="Localization\DefaultDateFormatterTests.cs" />
<Compile Include="Services\YamlParserTests.cs" />
<Compile Include="Stubs\StubApplicationEnvironment.cs" />
<Compile Include="Stubs\StubCultureSelector.cs" />
<Compile Include="Localization\TestHelpers.cs" />