Skip to content
Commit 8b0ed178 authored by Wolfgang Ziegler's avatar Wolfgang Ziegler
Browse files

Merge branch '8.x-3.x' into feature/config-defaults

Conflicts:
	src/Engine/ExpressionPluginManager.php
	src/Engine/RulesExpressionTrait.php
	src/Plugin/RulesExpression/ActionSet.php
	src/Plugin/RulesExpression/Rule.php
	src/Tests/ConfigEntityTest.php
	tests/src/Integration/RulesIntegrationTestBase.php
parents 53b6da8c 988426c8
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment