Merge branch 'develop' into magento-mpi-MC-31247

dhaecker · web-flow · commit 88e22f459310 · 2020-03-26T07:48:06.000-05:00
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/pagebuilder.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/pagebuilder.txt
@@ -0,0 +1 @@
+Magento/PageBuilder/Model/ResourceModel/Template/Grid

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Magento/PageBuilder/Model/ResourceModel/Template/Grid`