Skip to content

Commit

Permalink
Merge pull request #401 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
rpnykanen authored Sep 25, 2024
2 parents b872f62 + 24a0873 commit 3879e07
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 32 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cweagans/composer-patches": "^1.6.7",
"drupal/core": "^10.0",
"drupal/core-composer-scaffold": "^10.0",
"drupal/filelog": "^2.1",
"drupal/filelog": "^3.0",
"drupal/hdbt": "^6.0",
"drupal/hdbt_admin": "^3.0",
"drupal/helfi_azure_fs": "^2.0",
Expand Down
35 changes: 18 additions & 17 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ module:
field_ui: 0
file: 0
file_mdm: 0
filelog: 0
filter: 0
flysystem: 0
focal_point: 0
Expand Down
13 changes: 0 additions & 13 deletions conf/cmi/filelog.settings.yml

This file was deleted.

0 comments on commit 3879e07

Please sign in to comment.