Sebastien Ros 5c430ef7d1 Merge branch 'refs/heads/1.10.x' into dev ...

# Conflicts:
#	src/Orchard/Data/Migration/AutomaticDataMigrations.cs

2016-10-17 14:40:54 -07:00

..

Orchard

Merge branch 'refs/heads/1.10.x' into dev

2016-10-17 14:40:54 -07:00

Orchard.Azure.Tests

Orchard.Azure.Tests: Fixing a failing test case due to a change to fix a bug in AzureFileSystem.cs

2016-04-06 19:51:39 +02:00

Orchard.Core.Tests

Merge branch '1.10.x' into dev

2016-06-17 23:24:01 +02:00

Orchard.Profile

Updating version numbers to 1.10.1

2016-04-26 10:12:18 -07:00

Orchard.Specs

[Fixes #7132] Orchard.Fields - Inconsistent use of mandatory / required (#7134)

2016-09-22 13:14:44 -07:00

Orchard.Tests

Merge branch '1.10.x' into dev

2016-06-17 23:24:01 +02:00

Orchard.Tests.Modules

Merge branch '1.10.x' into dev

2016-06-17 23:24:01 +02:00

Orchard.WarmupStarter

Updating version numbers to 1.10.1

2016-04-26 10:12:18 -07:00

Orchard.Web

Merge branch 'refs/heads/1.10.x' into dev

2016-10-17 14:40:54 -07:00

Orchard.Web.Tests

Updating version numbers to 1.10.1

2016-04-26 10:12:18 -07:00

Tools

Merge branch '1.10.x' into dev

2016-05-05 17:45:57 -07:00

Gulpfile.js

Fixed bug with missing source maps in SASS transpilation.

2016-07-03 12:59:52 +02:00

Orchard.4.5.resharper

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Orchard.5.0.ReSharper

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Orchard.sln

Fixed bug with missing source maps in SASS transpilation.

2016-07-03 12:59:52 +02:00

OrchardBasicCorrectness.ruleset

Normalizing some more line endings

2015-12-13 22:26:26 +01:00

OrchardSecurity.ruleset

Normalizing some more line endings

2015-12-13 22:26:26 +01:00

Package.json

Merge branch '1.10.x' into dev

2016-05-05 17:45:57 -07:00

Rebracer.xml

[Fixes #7299] Update defaults for rebracer.xml (#7300)

2016-10-13 12:20:36 -07:00

Shapes.txt

Normalizing some more line endings

2015-12-13 22:26:26 +01:00

WebEssentials-Settings.json

…

Zones.txt

Normalizing some more line endings

2015-12-13 22:26:26 +01:00