yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
11ffafacdf42a461b793df8a3e32fda1c88b6a4f
Umbraco-CMS/src/Umbraco.Tests/Web
History
Sebastiaan Janssen b865c6b476 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/codefile.resource.js
#	src/Umbraco.Web.UI.Client/src/less/components/umb-table.less
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
2019-01-13 23:22:10 +01:00
..
AngularIntegration
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
Controllers
Merge branch origin/temp8 into temp8-di2690
2018-12-21 10:58:38 +01:00
HealthChecks
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
Mvc
Merge branch 'dev-v7' into temp8
2019-01-13 23:22:10 +01:00
HttpCookieExtensionsTests.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
TemplateUtilitiesTests.cs
Refactor configuration for DI
2019-01-07 19:40:07 +01:00
WebExtensionMethodTests.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00