Merge branch '1.6.x' of https://github.com/appwrite/appwrite into multi-region-support

Browse Source

# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/api/messaging.php
#	docker-compose.yml

...

This commit is contained in:

shimon committed 2024-12-14 20:18:06 +02:00

2 parents 8e0bd8d18d 9c2b78e612

commit aa2a45f142

34 files changed

+839 -758

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/api/projects.php

+204 -204

File diff suppressed because it is too large. Load diff