diff --git a/composer.json b/composer.json index ca94b926429bfe02dd15b34de458c04387b0cff0..85bfc3995266d1ae93743bc8f24f6c4ba8bd20d6 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "drupal/revision_log_default": "1.0", "drupal/webform": "5.0-rc1", "drupal/default_content": "1.0-alpha7", - "drupal/content_lock": "1.0-alpha4", + "drupal/content_lock": "1.0-alpha6", "drupal/node_edit_protection": "1.x-dev#902339c08222f838030c07aaea23bdc51ababebd", "drupal/rabbit_hole": "1.0-beta4", "drupal/fast_404": "1.0-alpha2", @@ -330,10 +330,6 @@ "Issue #2900089: Invalid translation language error when selected installation language does not match demo content language": "https://www.drupal.org/files/issues/2900089-14.patch" }, - "drupal/content_lock": { - "Issue #2907026: Fixed Warning: When we do not have content types yet in the system.": - "https://www.drupal.org/files/issues/2907026-7_0.patch" - }, "drupal/persistent_login": { "Issue #2899530: Hide user^s local task": "https://www.drupal.org/files/issues/persistent_login-user_task_permission-2899530-6.patch" diff --git a/drupal-org.make b/drupal-org.make index 468f99fb2d4b32326b83b50b8abd8e52c0452ead..d60c9c09d0d27544da81c4088350eed598d2f93c 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -224,9 +224,7 @@ projects[default_content][version] = 1.0-alpha7 projects[default_content][patch][] = https://www.drupal.org/files/issues/2900089-14.patch projects[content_lock][type] = module -projects[content_lock][version] = 1.0-alpha4 -;; Issue #2907026: Fixed Warning: When we do not have content types yet in the system. -projects[content_lock][patch][] = https://www.drupal.org/files/issues/2907026-7_0.patch +projects[content_lock][version] = 1.0-alpha6 projects[node_edit_protection][type] = module projects[node_edit_protection][download][url] = https://git.drupal.org/project/node_edit_protection.git