Skip to content

Commit

Permalink
Merge pull request #55 from aOelschlager/term_merge_module
Browse files Browse the repository at this point in the history
Term merge module
  • Loading branch information
rosiel authored Feb 22, 2023
2 parents 5ca48f3 + 519ed4f commit 4bc7034
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 2 deletions.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"drupal/rest_oai_pmh": "^2.0@beta",
"drupal/search_api_solr": "^4.2",
"drupal/taxonomy_manager": "^2.0",
"drupal/term_merge": "^2.0@beta",
"drupal/transliterate_filenames": "^2.0",
"drupal/twig_tweak": "^3.2",
"drupal/view_mode_switch": "^2.0",
Expand All @@ -60,7 +61,7 @@
"drupal/drupal": "*",
"drupal/core": "<=8"
},
"minimum-stability": "stable",
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"discard-changes": "stash",
Expand Down
117 changes: 116 additions & 1 deletion composer.lock

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

2 changes: 2 additions & 0 deletions config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ module:
system: 0
taxonomy: 0
taxonomy_manager: 0
term_merge: 0
term_reference_change: 0
text: 0
token: 0
toolbar: 0
Expand Down

0 comments on commit 4bc7034

Please sign in to comment.