Merge remote-tracking branch 'origin/v8/dev' into v8/feature/block-editor-list

# Conflicts: # src/Umbraco.Web.UI.Client/test/config/karma.conf.js
2020-06-23 14:57:39 +02:00
parent eeea641009 2fc55ae48a
commit bf12009b40
7 changed files with 11 additions and 11 deletions
--- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
+++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js
@@ -12,7 +12,7 @@ module.exports = function (config) {

            // Jasmine plugins
            'node_modules/jasmine-promise-matchers/dist/jasmine-promise-matchers.js',
-
+            
            //libraries
            'node_modules/jquery/dist/jquery.min.js',
            'node_modules/angular/angular.js',