From e5f0a12c256929e8d1f49fc171ad4f80361b2da9 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 17 Nov 2020 00:14:28 -0800 Subject: [PATCH 1/2] Updated version.php to master --- config/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/version.php b/config/version.php index 95c0fc847b22..3e9861394e97 100644 --- a/config/version.php +++ b/config/version.php @@ -6,5 +6,5 @@ 'prerelease_version' => '', 'hash_version' => 'g6eb860ca2', 'full_hash' => 'v5.0.7-87-g6eb860ca2', - 'branch' => 'develop', + 'branch' => 'master', ); \ No newline at end of file From f733eb339380c3b982cba488d45f4b46e56365fc Mon Sep 17 00:00:00 2001 From: Alexander Chibrikin Date: Sat, 5 Dec 2020 00:24:20 +0300 Subject: [PATCH 2/2] use supported package for slack --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7f22b183df6..73d1fcf2f36f 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "league/csv": "^9.5", "league/flysystem-aws-s3-v3": "^1.0", "league/flysystem-cached-adapter": "^1.0", - "maknz/slack": "^1.7", + "alek13/slack": "^1.7", "neitanod/forceutf8": "^2.0", "nesbot/carbon": "^2.32", "onelogin/php-saml": "^3.4",