From cc35925c9a835970063774ab9c5c23a0eb07232a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 13 Jul 2019 15:25:50 +0200 Subject: [PATCH 1/2] Update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index c6a6387..23f1bdb 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ LDAP module can be installed Developers info ---------------- -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/drupal_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/README_fr.md b/README_fr.md index dcd900d..a6218e1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,7 +44,6 @@ Le module d'authentification LDAP peut être installé Informations pour les développeurs ---------------- -**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/drupal_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. From cd16c946e3342d5480ffdcbd27e2352bac0750c6 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 28 Jul 2019 16:34:40 +0200 Subject: [PATCH 2/2] Upgrade to 8.7.5 --- README.md | 2 +- README_fr.md | 2 +- conf/composer.json | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 23f1bdb..df0d49e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Free and open-source content management framework. -**Shipped version:** 8.7.3 +**Shipped version:** 8.7.5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a6218e1..b2a9000 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Framework de gestion de contenu libre et open-source. -**Version incluse:** 8.7.3 +**Version incluse:** 8.7.5 ## Captures d'écran diff --git a/conf/composer.json b/conf/composer.json index 63ae704..e78f2a7 100644 --- a/conf/composer.json +++ b/conf/composer.json @@ -21,7 +21,7 @@ "cweagans/composer-patches": "^1.6.5", "drupal-composer/drupal-scaffold": "^2.5", "drupal/console": "^1.0.2", - "drupal/core": "^8.6.0", + "drupal/core": "^8.7.0", "drush/drush": "^9.0.0", "vlucas/phpdotenv": "^2.4", "webflo/drupal-finder": "^1.0.0", @@ -29,7 +29,7 @@ "zaporylie/composer-drupal-optimizations": "^1.0" }, "require-dev": { - "webflo/drupal-core-require-dev": "^8.6.0" + "webflo/drupal-core-require-dev": "^8.7.0" }, "conflict": { "drupal/drupal": "*" diff --git a/manifest.json b/manifest.json index 5c502aa..d7c31d0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Drupal for YunoHost application.", "fr": "Drupal pour YunoHost." }, - "version": "8.7.3~ynh1", + "version": "8.7.5~ynh1", "url": "https://www.drupal.org", "license": "GPL-2.0-or-later", "maintainer": {