Files
Umbraco-CMS/build
Shannon fcc71958e3 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx
2017-05-19 09:59:59 +10:00
..
2017-05-05 16:19:54 +02:00
2016-10-05 14:35:44 +02:00
2016-10-05 14:35:44 +02:00