Sebastiaan Janssen
9949e2676d
Merge branch 'dev-v7' into 7.4.0
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI.Client/bower.json
src/Umbraco.Web.UI.Client/src/less/main.less
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/Dashboard.Release.config
src/Umbraco.Web/Umbraco.Web.csproj
2015-12-01 15:16:57 +01:00
..
2015-06-16 15:04:31 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-12-01 15:16:57 +01:00
2015-06-18 10:14:31 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-10-14 09:59:09 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-07-13 09:49:34 +02:00
2015-11-30 19:18:57 +01:00
2015-10-22 18:07:17 +02:00
2015-06-24 21:43:14 +02:00
2015-07-13 09:49:34 +02:00
2015-10-14 09:59:13 +02:00
2015-06-24 21:43:14 +02:00
2015-10-06 21:03:00 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-12-01 15:16:57 +01:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-05-18 16:24:53 +02:00
2015-05-18 16:24:53 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00
2015-06-24 21:43:14 +02:00