Merge branch '1.8.x' into 1.x

Browse Source

Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj

...

This commit is contained in:

Sebastien Ros

2014-08-15 13:52:08 -07:00

parent 8787b7cd5c 9550146acc

commit c816d8e24f

19 changed files with 107 additions and 1644 deletions

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

BIN

lib/aspnetwebapi/System.Net.Http.dll

Binary file not shown.

1581

lib/aspnetwebapi/System.Net.Http.xml

File diff suppressed because it is too large Load Diff