neTp9c f6be2834ff Merge remote-tracking branch 'refs/remotes/origin/1.9.x' into issue/6107 ...

# Conflicts:

#	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs

2015-12-14 20:50:22 +03:00

..

Orchard

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

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

Orchard.Azure

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

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

Orchard.Azure.Tests

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

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

Orchard.Core.Tests

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

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

Orchard.Profile

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

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

Orchard.Specs

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

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

Orchard.Tests

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

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

Orchard.Tests.Modules

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

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

Orchard.WarmupStarter

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

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

Orchard.Web

Merge remote-tracking branch 'refs/remotes/origin/1.9.x' into issue/6107

2015-12-14 20:50:22 +03:00

Orchard.Web.Tests

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

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

Tools

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

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

Gulpfile.js

Merge pull request #5677 from dcinzona/Gulpfile-watch-assets.json

2015-09-08 11:37:54 -07: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

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

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

OrchardBasicCorrectness.ruleset

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

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

OrchardSecurity.ruleset

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

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

Package.json

Merge pull request #5677 from dcinzona/Gulpfile-watch-assets.json

2015-09-08 11:37:54 -07:00

Rebracer.xml

Fixing duplicate session creation

2015-07-30 15:49:13 -07:00

Shapes.txt

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

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

WebEssentials-Settings.json

Merged 'feature/layouteditor' into 1.x.

2015-02-19 22:14:55 +01:00

Zones.txt

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

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