Sebastien Ros d39485abf2 Merge branch '1.9.x' into 1.10.x ...

Conflicts:
	src/Orchard.Specs/MultiTenancy.feature
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard/Environment/DefaultOrchardHost.cs
	src/Rebracer.xml

2016-03-17 10:18:46 -07:00

..

Commands

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

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

Content

Cleaned up and reformatted all Web.config files according to #6072.

2016-01-22 20:38:34 +01:00

Controllers

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

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

Data/Migration

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

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

Events

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

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

Extensions

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

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

Models

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

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

Properties

Updating version numbers

2016-02-01 10:13:05 -08:00

Recipes

Reverted my own stupidity.

2015-08-03 16:44:58 +01:00

Scripts

Cleaned up and reformatted all Web.config files according to #6072.

2016-01-22 20:38:34 +01:00

Services

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

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

styles

Merge branch '1.9.x' into 1.10.x

2016-03-17 10:18:46 -07:00

ViewModels

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

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

Views

[Fixes #6328] Using FontAwesome from Orchard.Resources

2016-02-04 13:43:05 -08:00

AdminMenu.cs

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

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

Module.txt

Updating version numbers

2016-02-01 10:13:05 -08:00

Orchard.Modules.csproj

[Fixes #6328] Using FontAwesome from Orchard.Resources

2016-02-04 13:43:05 -08:00

packages.config

Retargeted NuGet references to targetFramework="net452". Fixes #6406.

2016-02-19 22:49:15 +01:00

Permissions.cs

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

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

ResourceManifest.cs

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

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

Web.config

Removing roslyn compilation for now

2016-02-01 11:55:04 -08:00