chore: fix merge conflicts
This commit is contained in:
parent
357409c508
commit
02acee9e2b
2 changed files with 8 additions and 3 deletions
|
@ -1,4 +1,10 @@
|
|||
# Version 1.5.7
|
||||
# Version 1.5.6
|
||||
## What's Changed
|
||||
|
||||
### Fixes
|
||||
* Change executor hostname back to exc1 to prevent name too long errors in the swoole table [#8147](https://github.com/appwrite/appwrite/pull/8147)
|
||||
|
||||
# Version 1.5.6
|
||||
## What's Changed
|
||||
|
||||
### Notable Changes
|
||||
|
@ -17,7 +23,6 @@
|
|||
* Fix Deprecated Warning in Doctor.php in [#8105](https://github.com/appwrite/appwrite/pull/8105)
|
||||
* Set limit to retrieve all stats for the usage range in [#8117](https://github.com/appwrite/appwrite/pull/8117)
|
||||
* Fix email used for name when user is created via Apple OAuth2 in [#8102](https://github.com/appwrite/appwrite/pull/8102)
|
||||
* Change executor hostname back to exc1 to prevent name too long errors in the swoole table [#8147](https://github.com/appwrite/appwrite/pull/8147)
|
||||
|
||||
### Miscellaneous
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 0af1af4852bfe4d9b234c74524b3f7592094e85f
|
||||
Subproject commit d75187458097a20b9e693079b16cb3f25933d31c
|
Loading…
Reference in a new issue