From 1a6f143857b95fd4272c5e2f3cb9017dea88bc32 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 5 May 2021 13:43:51 -0100 Subject: [PATCH] 0.19.13 Signed-off-by: Maxence Lange --- CHANGELOG.md | 5 +++++ Makefile | 2 +- appinfo/info.xml | 2 +- composer.json | 2 +- composer.lock | 21 +++++++++------------ 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91216b6eb..5cdcca023 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +### 0.19.13 + +- fix a conflict with 3rd parties app + + ### 0.19.12 - adding a configuration to fix generated link on proxy setup: frontal_cloud_id diff --git a/Makefile b/Makefile index 26a522612..54fd87545 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud branch=stable19 -version+=0.19.12 +version+=0.19.13 all: appstore diff --git a/appinfo/info.xml b/appinfo/info.xml index 695a76dbd..29a42ed0c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,7 +23,7 @@ Users won't be able to find this Circle using Nextcloud search engine. ]]> - 0.19.12 + 0.19.13 agpl Maxence Lange diff --git a/composer.json b/composer.json index 0a2f1f9aa..74332edbe 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "daita/my-small-php-tools": "dev-master" + "daita/my-small-php-tools": "~20" }, "config": { "optimize-autoloader": true diff --git a/composer.lock b/composer.lock index dd4058384..5714fa498 100644 --- a/composer.lock +++ b/composer.lock @@ -4,26 +4,25 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bc179f63f07c242d3b3f44fdbf15c8ab", + "content-hash": "adf375780a2f51ccbc7a04b7af8c9619", "packages": [ { "name": "daita/my-small-php-tools", - "version": "dev-master", + "version": "v20.0.1", "source": { "type": "git", "url": "https://github.com/daita/my-small-php-tools.git", - "reference": "22b1f104891706bb750fe13402d0d4645c66e399" + "reference": "313ce2a22dd034f14da42f8f8cd00ee0b99f41b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/22b1f104891706bb750fe13402d0d4645c66e399", - "reference": "22b1f104891706bb750fe13402d0d4645c66e399", + "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/313ce2a22dd034f14da42f8f8cd00ee0b99f41b1", + "reference": "313ce2a22dd034f14da42f8f8cd00ee0b99f41b1", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.0" }, - "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -43,17 +42,15 @@ "description": "My small PHP Tools", "support": { "issues": "https://github.com/daita/my-small-php-tools/issues", - "source": "https://github.com/daita/my-small-php-tools/tree/master" + "source": "https://github.com/daita/my-small-php-tools/tree/v20.0.1" }, - "time": "2021-02-24T19:31:24+00:00" + "time": "2021-04-26T12:46:18+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "daita/my-small-php-tools": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [],