Merge remote-tracking branch 'origin/7.1.5' into 7.2.0

Browse Source

Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config

...

This commit is contained in:

Sebastiaan Janssen

2014-08-04 13:32:44 +02:00

parent aceef2b318 1c83114c78

commit dba180d809

195 changed files with 6163 additions and 2412 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

2

src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.classic.min.css vendored

File diff suppressed because one or more lines are too long

2

src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.ie7.min.css vendored

File diff suppressed because one or more lines are too long

2

src/Umbraco.Web.UI.Client/lib/tinymce/skins/umbraco/skin.min.css vendored

File diff suppressed because one or more lines are too long