Skip to content

Commit 66bbc2c

Browse files
authored
Merge branch 'master' into master
2 parents d4f856c + 07ae55b commit 66bbc2c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Diff for: .gitattributes

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/.codecov.yml export-ignore
21
/.gitattributes export-ignore
32
/.github/ export-ignore
43
/.gitignore export-ignore
54
/CHANGELOG.md export-ignore
5+
/codecov.yml export-ignore
66
/CODE_OF_CONDUCT.md export-ignore
77
/CONTRIBUTING.md export-ignore
88
/CREDITS.md export-ignore
9-
/README.PROVIDER-GUIDE.md export-ignore
109
/docs/ export-ignore
1110
/phpunit.xml export-ignore
11+
/README.PROVIDER-GUIDE.md export-ignore
1212
/test/ export-ignore

Diff for: CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
## 2.6.0
44

5-
_Released: TBD_
5+
_Released: 2020-10-27_
66

7-
* Support PHP 8
7+
* Indicate support for PHP 8
8+
* Allow time to be set for testing purposes
9+
[#852](https://github.com/thephpleague/oauth2-client/pull/852)
810

911
## 2.5.0
1012

Diff for: .codecov.yml renamed to codecov.yml

File renamed without changes.

0 commit comments

Comments
 (0)