Skip to content

Commit 3982522

Browse files
chore: address merge conflicts
2 parents adb55ed + 05a5222 commit 3982522

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"require": {
3-
"firebase/php-jwt": "v6.9.*"
3+
"firebase/php-jwt": "v6.10.*"
44
}
55
}

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Below are versions that are currently supported and will receive security update
66

77
| Version | Supported |
88
|---------| ------------------ |
9+
| 1.7.x | :white_check_mark: |
910
| 1.6.x | :white_check_mark: |
10-
| 1.5.x | :white_check_mark: |
11-
| <=1.3.x | :x: |
11+
| <=1.5.x | :x: |
1212

1313
## Reporting a Vulnerability
1414

0 commit comments

Comments
 (0)