Merge branch 'master' into master

thephpleague · Nov 3, 2020 · 66bbc2c · 66bbc2c
2 parents d4f856c + 07ae55b
commit 66bbc2c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,12 +1,12 @@
-/.codecov.yml               export-ignore
 /.gitattributes             export-ignore
 /.github/                   export-ignore
 /.gitignore                 export-ignore
 /CHANGELOG.md               export-ignore
+/codecov.yml                export-ignore
 /CODE_OF_CONDUCT.md         export-ignore
 /CONTRIBUTING.md            export-ignore
 /CREDITS.md                 export-ignore
-/README.PROVIDER-GUIDE.md   export-ignore
 /docs/                      export-ignore
 /phpunit.xml                export-ignore
+/README.PROVIDER-GUIDE.md   export-ignore
 /test/                      export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,11 @@
 
 ## 2.6.0
 
-_Released: TBD_
+_Released: 2020-10-27_
 
-* Support PHP 8
+* Indicate support for PHP 8
+* Allow time to be set for testing purposes
+  [#852](https://github.com/thephpleague/oauth2-client/pull/852)
 
 ## 2.5.0
 

diff --git a/.codecov.yml → codecov.yml b/.codecov.yml → codecov.yml