Skip to content

Commit eeb76c4

Browse files
committed
Merge branch '2.6' into 2.7
Conflicts: src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
2 parents d34208f + 9532aaa commit eeb76c4

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
composer.lock
2+
phpunit.xml
3+
vendor/

0 commit comments

Comments
 (0)