Benedek Farkas 7599a25594 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.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Profile/Orchard.Profile.csproj
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Web/Core/Navigation/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Mvc/MvcModule.cs
#	src/Orchard/Orchard.Framework.csproj

2017-11-10 00:54:02 +01:00

..

Body

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

2015-12-13 23:46:19 +01:00

Common

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

2015-12-13 23:46:19 +01:00

Feeds/Controllers

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

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

Properties

Updating version number

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

Scheduling

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

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

Settings/Metadata

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

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

App.config

Fixing leftover MVC references by changing them to also use packages

2016-01-06 01:04:40 +01:00

Orchard.Core.Tests.csproj

Merge branch '1.10.x' into dev

2017-11-10 00:54:02 +01:00

packages.config

Merge branch '1.10.x' into dev

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