Sebastiaan Janssen
dba180d809
Merge remote-tracking branch 'origin/7.1.5' into 7.2.0
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
2014-08-04 13:32:44 +02:00
..
2014-01-24 18:23:37 +11:00
2014-07-24 14:24:13 +02:00
2014-08-04 13:32:44 +02:00
2014-05-16 11:29:35 +02:00
2014-05-16 12:27:54 +02:00
2014-01-24 18:23:37 +11:00
2013-06-23 15:13:27 +02:00
2013-02-27 13:51:58 -01:00
2013-04-25 09:02:58 -02:00
2014-06-10 18:47:02 +02:00