Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2

# Conflicts:
#	composer.lock
This commit is contained in:
Jake Barnby 2023-04-03 15:55:17 +12:00
commit af890a4e4b
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
2 changed files with 8 additions and 8 deletions

View file

@ -43,7 +43,7 @@
"ext-sockets": "*", "ext-sockets": "*",
"appwrite/php-clamav": "1.1.*", "appwrite/php-clamav": "1.1.*",
"appwrite/php-runtimes": "0.11.*", "appwrite/php-runtimes": "0.11.*",
"utopia-php/abuse": "0.22.*", "utopia-php/abuse": "0.23.*",
"utopia-php/analytics": "0.2.*", "utopia-php/analytics": "0.2.*",
"utopia-php/audit": "0.24.*", "utopia-php/audit": "0.24.*",
"utopia-php/cache": "0.8.*", "utopia-php/cache": "0.8.*",

14
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e0dde4ed86408c36cdc244b7c649c2a6", "content-hash": "5786ffa54eafbe063c8d314308fcc16d",
"packages": [ "packages": [
{ {
"name": "adhocore/jwt", "name": "adhocore/jwt",
@ -1808,16 +1808,16 @@
}, },
{ {
"name": "utopia-php/abuse", "name": "utopia-php/abuse",
"version": "0.22.1", "version": "0.23.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/utopia-php/abuse.git", "url": "https://github.com/utopia-php/abuse.git",
"reference": "9360a026d18809e35523b254ab57e51055008203" "reference": "4319461f4dde080b9dffaceea048f9e4f8949a52"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/utopia-php/abuse/zipball/9360a026d18809e35523b254ab57e51055008203", "url": "https://api.github.com/repos/utopia-php/abuse/zipball/4319461f4dde080b9dffaceea048f9e4f8949a52",
"reference": "9360a026d18809e35523b254ab57e51055008203", "reference": "4319461f4dde080b9dffaceea048f9e4f8949a52",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1851,9 +1851,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/utopia-php/abuse/issues", "issues": "https://github.com/utopia-php/abuse/issues",
"source": "https://github.com/utopia-php/abuse/tree/0.22.1" "source": "https://github.com/utopia-php/abuse/tree/0.23.0"
}, },
"time": "2023-03-23T07:30:49+00:00" "time": "2023-03-31T07:54:08+00:00"
}, },
{ {
"name": "utopia-php/analytics", "name": "utopia-php/analytics",