Skip to content

Commit

Permalink
Merge pull request #40 from OS2Forms/develop
Browse files Browse the repository at this point in the history
Merge develop into main branch
  • Loading branch information
madsnorgaard authored Jan 25, 2022
2 parents 125a93a + 335426b commit 6d84f6f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"require": {
"drupal/gin": "^3.0",
"drupal/core": "^8 || ^9",
"os2forms/os2forms": "^2.8",
"os2forms/os2forms_forloeb": "^1.9",
"os2forms/os2forms": "^3.1",
"os2forms/os2forms_forloeb": "^2.0.0-rc",
"os2web/os2web_simplesaml": "8.x-dev"
},
"extra": {
Expand Down
3 changes: 3 additions & 0 deletions config/install/mailsystem.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
defaults:
sender: SMTPMailSystem
formatter: SMTPMailSystem
1 change: 0 additions & 1 deletion os2forms_forloeb_profile.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ install:
- webform_entity_print
- webform_entity_print_attachment
- webform_migrate
- webform_permissions_by_term
- webform_remote_handlers
- webform_rest
- webform_scheduled_email
Expand Down

0 comments on commit 6d84f6f

Please sign in to comment.