Shannon
a0761b92b8
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
Conflicts:
build/RevertToCleanInstall.bat
build/RevertToEmptyInstall.bat
src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
src/Umbraco.Web.UI.Client/src/less/pages/login.less
src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
2015-11-09 12:33:53 +01:00
..
2014-01-24 18:23:37 +11:00
2015-11-09 09:25:58 +01:00
2015-06-21 14:41:18 +02:00
2015-07-27 16:08:28 +02:00
2015-06-21 14:41:18 +02:00
2014-01-24 18:23:37 +11:00
2014-10-19 13:00:54 +02:00
2013-06-23 15:13:27 +02:00
2015-11-09 09:25:59 +01:00
2015-11-09 09:25:59 +01:00
2015-10-15 17:12:13 +02:00