Skip to content

Commit

Permalink
Merge pull request #466 from UN-OCHA/develop
Browse files Browse the repository at this point in the history
[IASC-698][OPS-7462] Security updates and a view fix.
  • Loading branch information
cafuego authored May 18, 2021
2 parents e859d1e + b49daa6 commit 6473b35
Show file tree
Hide file tree
Showing 5 changed files with 2,845 additions and 5,162 deletions.
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
],
"require": {
"php": ">=7.2",
"composer/composer": "^1.10.22",
"composer/installers": "^1.7",
"cweagans/composer-patches": "^1.6.5",
"drupal/address": "^1.6",
Expand All @@ -37,13 +38,14 @@
"drupal/core-composer-scaffold": "^8.8",
"drupal/core-dev": "^8.8",
"drupal/core-recommended": "^8.8",
"drupal/ctools": "^3.6",
"drupal/date_recur": "^2.0@beta",
"drupal/date_recur_modular": "^2.0.0",
"drupal/diff": "^1.0@RC",
"drupal/dream_block_manager": "^1.0",
"drupal/dynamic_entity_reference": "^1.7",
"drupal/entityqueue": "^1.0",
"drupal/facets": "^1.4",
"drupal/facets": "^1.8",
"drupal/facets_pretty_paths": "^1.0@beta",
"drupal/fasttoggle": "^2.0@alpha",
"drupal/field_collection": "^1.0@alpha",
Expand Down Expand Up @@ -88,7 +90,7 @@
"drush/drush": "^9.0.0",
"npm-asset/select2": "^4.0",
"oomphinc/composer-installers-extender": "^1.1",
"phpoffice/phpspreadsheet": "1.11",
"phpoffice/phpspreadsheet": "^1.16",
"symfony/event-dispatcher": "4.3.3 as 3.4.41",
"symfony/filesystem": "^3.4",
"symfony/finder": "^3.4",
Expand Down
117 changes: 76 additions & 41 deletions composer.lock

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

Loading

0 comments on commit 6473b35

Please sign in to comment.