Sebastiaan Janssen
05c592860d
Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-11-17 13:43:19 +01:00
..
2014-01-24 18:23:37 +11:00
2015-11-17 09:24:22 +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-11-13 11:26:31 +01:00