Lombiq 5a6b56cc72 Merge branch '1.10.x' into dev ...

# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config

2017-12-22 21:05:17 +01:00

..

Config

[Fixes #7425] Session Locator | Isolation Levels not respected in Sites.config (#7466)

2016-12-08 12:32:21 -08:00

Core

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

Media

Reformatted one more Web.config file.

2016-01-22 20:41:30 +01:00

Modules

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

Properties

Updating version number

2017-04-03 12:21:56 -07:00

Themes

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

Global.asax

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

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

Global.asax.cs

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

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

Orchard.Web.csproj

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

packages.config

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

Refresh.html

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

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

Web.config

Merge branch '1.10.x' into dev

2017-12-22 21:05:17 +01:00

Web.Debug.config

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

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

Web.Release.config

Glimpse (#7502)

2017-01-19 12:47:08 -08:00