Skip to content

Sync 1.4.x to 1.5.x - #6965

Merged
abnegate merged 288 commits into
1.5.xfrom
sync-1.4.x-to-1.5.x
Oct 24, 2023
Merged

abnegate merged 288 commits into
1.5.xfrom
sync-1.4.x-to-1.5.x

Conversation

@fanatic75

Copy link
Copy Markdown
Contributor

What does this PR do?

Sync 1.4.x to 1.5.x

Test Plan

(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)

Related PRs and Issues

  • (Related PR or issue)

Checklist

  • Have you read the Contributing Guidelines on issues?
  • If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?

shimonewman and others added 30 commits June 5, 2023 19:13
Fixed suggested changes by Matej
…orkers

� Conflicts:
�	.env
�	app/cli.php
�	app/config/collections.php
�	app/console
�	app/controllers/api/account.php
�	app/controllers/api/databases.php
�	app/controllers/api/functions.php
�	app/controllers/api/projects.php
�	app/controllers/api/storage.php
�	app/controllers/api/teams.php
�	app/controllers/api/users.php
�	app/controllers/general.php
�	app/controllers/shared/api.php
�	app/init.php
�	app/worker.php
�	app/workers/audits.php
�	app/workers/builds.php
�	app/workers/certificates.php
�	app/workers/databases.php
�	app/workers/deletes.php
�	app/workers/functions.php
�	app/workers/mails.php
�	bin/worker-usage
�	composer.json
�	composer.lock
�	docker-compose.yml
�	src/Appwrite/Event/Delete.php
�	src/Appwrite/Event/Mail.php
�	src/Appwrite/Platform/Tasks/Maintenance.php
christyjacob4 and others added 25 commits October 20, 2023 16:59
Fix missing body in async function execution
@abnegate
abnegate merged commit cbae797 into 1.5.x Oct 24, 2023
@stnguyen90
stnguyen90 deleted the sync-1.4.x-to-1.5.x branch April 25, 2024 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants