Skip to content

Commit 333faf1

Browse files
authored
Merge branch 'develop' into feature/maps-element-display
2 parents fcbd689 + 5fc32cb commit 333faf1

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
1313

1414
- [PR-315](https://github.com/OS2Forms/os2forms/pull/315)
1515
Added “Display on“ options to Map element
16+
- [PR-317](https://github.com/OS2Forms/os2forms/pull/317)
17+
Updated code analysis script.
1618
- [PR-306](https://github.com/OS2Forms/os2forms/pull/306)
1719
Made digital signature text placement configurable.
1820
- [#251](https://github.com/OS2Forms/os2forms/issues/251)

scripts/code-analysis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ drupal_composer config --no-plugins allow-plugins true
4040

4141
# Making Drupal 10 compatible
4242
drupal_composer require psr/http-message:^1.0
43-
drupal_composer require mglaman/composer-drupal-lenient
43+
drupal_composer require mglaman/composer-drupal-lenient:^1.0
4444
drupal_composer config --merge --json extra.drupal-lenient.allowed-list '["drupal/coc_forms_auto_export", "drupal/webform_node_element"]'
4545

4646
drupal_composer require wikimedia/composer-merge-plugin

0 commit comments

Comments
 (0)