Merge branch 'feature/owin' of https://git01.codeplex.com/orchard into feature/owin

Browse Source

Conflicts:
	src/Orchard.Web/Web.config

...

This commit is contained in:

Lombiq

2014-10-27 17:15:33 +01:00

committed by Zoltán Lehóczky

parent dff7f54d90 17c911d9a4

commit a32691ba1d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available