Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use supported package for slack #8867

Merged
merged 26 commits into from
Dec 15, 2020
Merged

use supported package for slack #8867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e5f0a12
Updated version.php to master
snipe Nov 17, 2020
e4b0e96
Merge remote-tracking branch 'origin/develop'
snipe Nov 17, 2020
124af6a
Merge remote-tracking branch 'origin/develop'
snipe Nov 17, 2020
6ebdfdb
Merge remote-tracking branch 'origin/develop'
snipe Nov 18, 2020
e805fef
Merge remote-tracking branch 'origin/develop'
snipe Nov 18, 2020
20ef74d
Merge remote-tracking branch 'origin/develop'
snipe Nov 18, 2020
cc4f1a1
Merge remote-tracking branch 'origin/develop'
snipe Nov 18, 2020
9e30be8
Merge remote-tracking branch 'origin/develop'
snipe Nov 18, 2020
9e2d402
Merge remote-tracking branch 'origin/develop'
snipe Nov 18, 2020
ae5635f
Merge remote-tracking branch 'origin/develop'
snipe Nov 20, 2020
98dfb9d
Merge remote-tracking branch 'origin/develop'
snipe Nov 20, 2020
02fef70
Merge remote-tracking branch 'origin/develop'
snipe Nov 24, 2020
ef95739
Merge remote-tracking branch 'origin/develop'
snipe Nov 24, 2020
74b26a3
Merge remote-tracking branch 'origin/develop'
snipe Nov 24, 2020
bf1f865
Merge remote-tracking branch 'origin/develop'
snipe Nov 25, 2020
26e4354
Merge remote-tracking branch 'origin/develop'
snipe Nov 25, 2020
bef42eb
Merge remote-tracking branch 'origin/develop'
snipe Nov 25, 2020
96eb623
Merge remote-tracking branch 'origin/develop'
snipe Nov 25, 2020
2105a1e
Merge remote-tracking branch 'origin/develop'
snipe Nov 25, 2020
b0d493e
Merge remote-tracking branch 'origin/develop'
snipe Nov 30, 2020
f9b1fdc
Merge remote-tracking branch 'origin/develop'
snipe Dec 1, 2020
60d269a
Merge remote-tracking branch 'origin/develop'
snipe Dec 1, 2020
5f3a1f6
Merge remote-tracking branch 'origin/develop'
snipe Dec 1, 2020
0e1f6a3
Merge remote-tracking branch 'origin/develop'
snipe Dec 2, 2020
f733eb3
use supported package for slack
alek13 Dec 4, 2020
2dd7d4b
Merge branch 'develop' into patch-2
snipe Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions config/version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
'full_app_version' => 'v5.0.11 - build 5695-gfd4ee6027',
'build_version' => '5695',
'prerelease_version' => '',
'hash_version' => 'gfd4ee6027',
'full_hash' => 'v5.0.11-13-gfd4ee6027',
'branch' => 'develop',
'hash_version' => 'gf9b1fdc36',
'full_hash' => 'v5.0.10-21-gf9b1fdc36',
'branch' => 'master',
);