Skip to content

Commit caf8dc5

Browse files
authored
Merge pull request #1 from OS2web/develop
Update master barnch with recent commits
2 parents b24bed4 + 0c2e195 commit caf8dc5

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@
1414
"type": "composer",
1515
"url": "https://asset-packagist.org"
1616
}
17-
},
17+
},
1818
"require": {
1919
"os2core/os2core": "dev-master",
2020
"drupal/ckeditor_iframe": "^2.0",
2121
"drupal/menu_item_extras": "^2.11",
2222
"drupal/metatag": "^1.13",
2323
"drupal/scheduler_content_moderation_integration": "^1.3",
24-
"drupal/textfield_counter": "^1.11"
24+
"drupal/textfield_counter": "^1.11",
25+
"drupal/save_edit": "^1.3",
26+
"drupal/swiftmailer": "^2.0@beta",
27+
"drupal/rules": "^3.0@alpha",
28+
"drupal/user_delete_reassign": "1.x-dev",
29+
"drupal/node_revision_delete": "^1.0@RC",
30+
"drupal/media_skyfish": "^1.3",
31+
"drupal/facets": "^1.5"
2532
}
2633
}

config/optional/core.date_format.os2core_datetime_medium.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ dependencies: { }
44
id: os2core_datetime_medium
55
label: 'OS2 - mellem dato og tid'
66
locked: false
7-
pattern: 'j. F Y - h:i'
7+
pattern: 'j. F Y - H:i'

0 commit comments

Comments
 (0)