Skip to content

Commit b13060e

Browse files
committed
Merge branch 'main' into fork/Niklan/2.x-formatter-generic
# Conflicts: # stubs/Drupal/Core/Field/FormatterInterface.stub
2 parents 29ca5db + 41ade7d commit b13060e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

stubs/Drupal/Core/Field/FormatterInterface.stub

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
<?php
23

34
namespace Drupal\Core\Field;

0 commit comments

Comments
 (0)