1650 commits

Author	SHA1	Message	Date
Bradley Schofield	a30dd72b0f	Remove unnecessary repo in composer.json	2024-10-31 18:06:07 +09:00
Bradley Schofield	2f64620cb5	Use actual package	2024-10-31 17:27:13 +09:00
Bradley Schofield	e15ac03c59	Merge branch '1.6.x' into chore-update-databases-findone ... # Conflicts: # composer.json # composer.lock	2024-10-31 16:57:45 +09:00
Bradley Schofield	aa6e0d3fc3	Update Migration Lib	2024-10-31 15:26:16 +09:00
Bradley Schofield	bb72fd8834	Fix source creds being over written and begin implementing migrations tests	2024-10-30 14:23:24 +09:00
Jake Barnby	0f11c249b9	Update messaging for FCM response fix	2024-10-22 14:07:32 +13:00
Jake Barnby	45c8584903	Update migration	2024-10-16 21:36:18 +13:00
Jake Barnby	16d65f32b3	Review fixes	2024-10-16 21:35:32 +13:00
fogelito	801724e90e	APP_DATABASE_QUERY_VALUES	2024-10-15 15:50:02 +03:00
Matej Bačo	16a8fdce4e	Merge branch '1.6.x' into fix-move-write-execution-to-worker	2024-10-13 21:08:13 +02:00
Fabian Gruber	de06af6c4b	chore: update utopia-php/system to 0.9.0	2024-10-11 15:59:04 +02:00
Jake Barnby	4fa8f01ce2	Call migration success on success	2024-10-10 21:15:18 +13:00
Jake Barnby	b0f3a99b4b	Merge remote-tracking branch 'origin/cl-1.6.0-16-update-deno' into 1.6.x ... # Conflicts: # app/config/function-templates.php # composer.lock	2024-10-10 14:23:50 +13:00
Christy Jacob	d33ecfa7f5	chore: update php runtimes	2024-10-09 16:06:34 +00:00
Christy Jacob	e0ebeb837a	chore: update php runtimes	2024-10-09 16:04:36 +00:00
Jake Barnby	76c29f72f0	Merge pull request #8777 from appwrite/feat-move-attributes ... Move new attributes	2024-10-09 23:00:09 +13:00
Jake Barnby	473f97fe92	Update migration	2024-10-09 22:55:50 +13:00
Khushboo Verma	d1ab8c4df8	Move createDocument from api to worker	2024-10-09 14:04:08 +05:30
Matej Bačo	5287e70f9a	Add new runtimes	2024-10-08 16:20:04 +02:00
Jake Barnby	a6a67301a4	Update packages	2024-10-08 23:09:19 +13:00
Jake Barnby	325c9d61cc	Lock	2024-10-08 23:02:55 +13:00
Jake Barnby	c8cbcfefbb	Update database	2024-10-08 23:01:54 +13:00
Jake Barnby	8bc37026cd	Revert "Feat adding coroutines"	2024-10-08 20:54:40 +13:00
Bradley Schofield	1a903efc06	Use repository temporarily to check tests	2024-10-08 11:34:27 +09:00
Binyamin Yawitz	40266481e0	chore: package update	2024-10-07 20:48:55 -04:00
Binyamin Yawitz	160b6c3386	chore: updates	2024-10-07 15:11:39 -04:00
Binyamin Yawitz	16835f96bf	chore: merge	2024-10-07 11:02:18 -04:00
Bradley Schofield	4c5b202f8d	Merge branch '1.6.x' into chore-update-databases-findone ... # Conflicts: # composer.json # composer.lock	2024-10-07 11:42:43 +09:00
Torsten Dittmann	4f4edc48af	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into migrations-backups	2024-10-02 17:38:50 +02:00
Torsten Dittmann	48e57be312	chore: update composer lock	2024-10-02 17:18:10 +02:00
Damodar Lohani	d4195aa3a6	update utopia image	2024-10-02 06:02:10 +00:00
Damodar Lohani	5f3e986ed3	Merge remote-tracking branch 'origin/1.6.x' into feat-heic-support	2024-10-02 06:00:28 +00:00
Binyamin Yawitz	6ce8c6a73d	chore: merge	2024-10-01 21:39:40 -04:00
Christy Jacob	4069ae7165	chore: remove db disk storage calculation	2024-10-01 21:45:34 +04:00
Binyamin Yawitz	579d3d7f14	chore: lint & updates	2024-10-01 10:39:43 -04:00
Binyamin Yawitz	d14edf4207	reverting: to set coroutines as head	2024-10-01 10:30:47 -04:00
Bradley Schofield	1e7c51cf04	Update lockfile	2024-09-27 12:50:32 +09:00
fogelito	672c8b2730	lock file	2024-09-26 10:52:53 +03:00
Bradley Schofield	0101fbda8c	Update dependencies	2024-09-24 17:58:25 +09:00
Bradley Schofield	00acc2f73b	Address Comments	2024-09-24 00:07:54 +09:00
Bradley Schofield	be3e3790c9	Update Database lib, update instances where findOne is used to ensure we check document is empty.	2024-09-18 14:47:36 +09:00
Binyamin Yawitz	e246005c51	chore: merge	2024-09-16 11:17:40 -04:00
Torsten Dittmann	b3ea0bbb6b	chore: update compose lock file	2024-09-16 12:04:56 +02:00
Jake Barnby	5a8adcc0f6	Update database	2024-09-10 22:21:52 +12:00
Binyamin Yawitz	8bc123848f	chore: packages update	2024-09-10 11:46:58 +02:00
Binyamin Yawitz	3571260a2b	chore: packages update	2024-09-10 11:06:02 +02:00
Binyamin Yawitz	1861ae3f68	fix: mock phone tests	2024-09-09 17:48:26 +02:00
Binyamin Yawitz	828928b609	chore: packages update	2024-09-09 15:03:49 +02:00
Jake Barnby	a6d2fe6d39	Update SDK generator	2024-09-09 20:37:41 +12:00
Jake Barnby	72d6fb3901	Merge branch '1.6.1' into feat-string-attribute-resizing ... # Conflicts: # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json # composer.lock	2024-09-04 21:06:21 +12:00
Jake Barnby	a2ce65a5ea	Update database for deadlock fix	2024-09-02 18:33:45 +12:00
Bradley Schofield	627cbe285f	Address Comments	2024-08-30 19:18:45 +09:00
Bradley Schofield	40b1c28db0	Implement String Attribute Resizing	2024-08-30 18:22:17 +09:00
Christy Jacob	fec30cc614	feat: update SDK version	2024-08-27 15:56:15 +04:00
Christy Jacob	2ccf617dd8	feat: update SDK version	2024-08-27 14:25:25 +04:00
Torsten Dittmann	e78767f1a0	chore: bump console sdk	2024-08-26 17:16:39 +02:00
Binyamin Yawitz	42631aa85e	chore: versions update	2024-08-23 11:55:21 -04:00
Matej Bačo	6b940bad05	gix go runtime	2024-08-22 15:44:58 +00:00
Matej Bačo	31e4a24a76	Merge remote-tracking branch 'origin/1.6.x' into feat-benchmark-headers	2024-08-22 12:58:05 +00:00
Matej Bačo	df43553857	Update specs and lockfile	2024-08-22 11:01:31 +00:00
Matej Bačo	37e3c3ee19	Lockfile update	2024-08-21 12:27:11 +00:00
Matej Bačo	d0cf2e26d6	Merge remote-tracking branch 'origin/1.6.x' into feat-benchmark-headers	2024-08-21 12:26:59 +00:00
Christy Jacob	bf2ff4be0f	feat: update SDKs and docs	2024-08-21 14:53:05 +04:00
Matej Bačo	67afb41702	Update lockfile	2024-08-21 07:31:05 +00:00
Matej Bačo	573aaa1613	Merge remote-tracking branch 'origin/1.6.x' into feat-benchmark-headers	2024-08-21 07:29:11 +00:00
Christy Jacob	c760fb7d3f	feat: update SDKs and docs	2024-08-21 00:25:30 +04:00
Christy Jacob	95feb59e0a	chore: update SDKs	2024-08-20 14:50:57 +04:00
Matej Bačo	69977138da	Add headers validator benchmark	2024-08-20 08:47:50 +00:00
Bradley Schofield	3ed9dd288e	Test 8GB 8192MB	2024-08-19 19:12:25 +09:00
Matej Bačo	d17efb0180	Upgrade libs	2024-08-16 11:03:54 +00:00
Matej Bačo	894a2bb646	Add seconds precision to scheduledAt	2024-08-16 09:11:13 +00:00
Matej Bačo	9964631bb7	Apply new terminology for template branch	2024-08-14 10:01:04 +00:00
Matej Bačo	72e4534025	Merge remote-tracking branch 'origin/1.6.x' into fix-manual-templates	2024-08-14 09:50:46 +00:00
Christy Jacob	748c298e06	chore: generate specs	2024-08-13 15:59:04 +00:00
Christy Jacob	bfa253297b	Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.6-main	2024-08-13 15:36:13 +00:00
Matej Bačo	380dc8a106	Fix manual templates	2024-08-13 10:50:58 +00:00
Khushboo Verma	e4cfcd00fd	Updated composer.json	2024-08-12 23:17:22 +05:30
Damodar Lohani	9a140f90d4	update image library	2024-08-09 14:12:10 +00:00
Binyamin Yawitz	9e81e5fe3c	chore: Upgrading logger	2024-08-08 09:53:18 -04:00
Khushboo Verma	dcf1684c8c	Update dynamic response method	2024-08-07 18:45:53 +05:30
Khushboo Verma	3190384d24	Add multipart support	2024-08-05 18:38:41 +05:30
Matej Bačo	bb1371c1fa	Update sdks to 1.6.x	2024-08-02 14:36:29 +02:00
Matej Bačo	85fa7268b5	Upgrade lib version	2024-07-30 07:51:57 +00:00
Matej Bačo	e33a035a81	Upgrade lib	2024-07-29 21:01:32 +02:00
Matej Bačo	cb9e5bd0ae	Upgrade VCS and support 0.1.x tags	2024-07-29 19:28:15 +02:00
Torsten Dittmann	6cb9dd0ac8	chore: update composer lock	2024-07-17 18:22:54 +02:00
Torsten Dittmann	9fb3cc82c3	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into 1.6.x-sdks	2024-07-10 18:04:25 +02:00
Torsten Dittmann	37c23de29d	chore: bump version	2024-07-10 18:00:22 +02:00
Bradley Schofield	a5ef5f3d75	Fix Lock	2024-07-10 16:34:02 +09:00
Jake Barnby	b343158d19	Merge remote-tracking branch 'origin/main' into 1.6.x ... # Conflicts: # .gitmodules # app/console # composer.lock # tests/e2e/Services/Health/HealthCustomServerTest.php	2024-07-10 19:11:04 +12:00
Bradley Schofield	d84d227c2b	Update Migrations to 0.5	2024-07-10 14:59:31 +09:00
Torsten Dittmann	5a5609dc0a	feat: 1.6.x sdks	2024-07-03 17:25:40 +02:00
Matej Bačo	914886d79f	Update specs	2024-07-03 10:32:13 +00:00
Khushboo Verma	e9034a9d9d	Fix missing closing bracket	2024-07-02 17:08:59 +05:30
Khushboo Verma	aab4665701	Resolve merge conflict	2024-07-02 15:02:58 +05:30
Matej Bačo	f87e2bc879	Binary support & tests for Router	2024-07-01 10:35:06 +02:00
Matej Bačo	186cef458b	Implemented vcs.getRepositoryContents()	2024-06-26 10:03:27 +00:00
Steven Nguyen	636497304e	Merge branch '1.5.x' into chore-sync-1.5.x-into-main	2024-06-25 23:47:37 +00:00
Steven Nguyen	c6489d172f	chore: bump utopia-php/database and related packages ... utopia-php/database version 0.50.0 includes a new skipValidation() function we can use to skip validation when making queries.	2024-06-24 23:38:40 +00:00
Christy Jacob	7b63f68fc3	chore: fix tests	2024-06-21 18:02:01 +00:00
Christy Jacob	a2f27ec15f	Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main	2024-06-21 13:11:35 +00:00
Christy Jacob	330e7a93c6	chore: composer update	2024-06-20 15:27:16 +00:00
Christy Jacob	fdf44c7bab	Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main	2024-06-20 15:26:17 +00:00
shimon	12813a2f29	update cache and database lib	2024-06-18 18:51:00 +03:00
Damodar Lohani	c179e89fdf	update to use latest platform with module	2024-06-09 01:03:40 +00:00
Damodar Lohani	ec69507818	Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-upgrade-platform-with-module	2024-06-06 08:32:07 +00:00
shimon	cdf7e1a8dc	composer	2024-06-05 22:29:47 +03:00
shimon	f06e19d8fa	composer	2024-06-05 20:52:35 +03:00
shimon	e2c6c61083	composer	2024-06-05 20:40:14 +03:00
Damodar Lohani	a823bca463	update platform	2024-06-04 08:04:51 +00:00
Damodar Lohani	fef769271f	Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-upgrade-platform-with-module	2024-06-04 08:00:19 +00:00
shimon	e28224976a	refactor redis cache	2024-06-02 16:17:11 +03:00
loks0n	64e0c88349	Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into feat-support-twilio-messaging-service-sid	2024-05-30 16:48:08 +01:00
fogelito	e91a532e74	Database tag	2024-05-30 18:46:21 +03:00
loks0n	c6a520909e	feat: support twilio messaging service sid	2024-05-30 16:23:15 +01:00
fogelito	065b5f4858	test	2024-05-30 16:07:11 +03:00
Khushboo Verma	b880a0a7b2	Remove :buildId from endpoint as discussed	2024-05-27 18:21:28 +05:30
Khushboo Verma	4e8855fad3	Merge branch '1.6.x' into feat-cancel-build-deployment	2024-05-27 18:03:59 +05:30
Christy Jacob	cd5f6f58a2	Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main	2024-05-24 12:43:56 +00:00
shimon	a22d98296c	lint	2024-05-23 16:33:40 +03:00
Khushboo Verma	f0de4c6eac	Resolved merge conflict	2024-05-23 18:34:48 +05:30
Christy Jacob	54093617ee	chore: linter	2024-05-22 19:57:57 +00:00
Christy Jacob	aa76862692	Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x	2024-05-22 19:43:31 +00:00
shimon	892caf4710	update composer	2024-05-22 17:51:28 +03:00
shimon	6639714a1b	updating composer	2024-05-22 16:37:45 +03:00
shimon	72cfa82e8d	updating composer	2024-05-22 16:03:47 +03:00
Steven Nguyen	215b1a2864	chore: bump sdk generator version	2024-05-20 15:31:06 -07:00
Steven Nguyen	722f3291fa	Merge branch 'main' into chore-sync-with-main	2024-05-20 18:33:52 +00:00
loks0n	3d119ad1a6	fix: improve cold start error	2024-05-17 18:16:10 +01:00
Bradley Schofield	51a2731533	Update composer.lock	2024-05-17 18:36:25 +09:00
Bradley Schofield	deacaa2d6f	Multiple Changes, See Desc ... - Update Logger from 0.3.* to 0.5.* - Add old sentry syntax conversion - Add sampler for experiment logger, and set it to 4%	2024-05-17 18:01:33 +09:00
Steven Nguyen	8a18fee89b	chore: bump dependencies	2024-05-16 13:01:58 -07:00
Jake Barnby	d1ee8aeeed	Update database	2024-05-13 12:09:08 +12:00
Damodar Lohani	1d9f5fa29d	Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-upgrade-platform-with-module	2024-05-09 07:50:17 +00:00
Jake Barnby	d0e258854c	Fix project deletes for shared tables	2024-05-09 16:52:53 +12:00
Jake Barnby	0fe7235c44	Update database	2024-05-08 21:30:49 +12:00
Jake Barnby	bfc4c98600	Update to DSN release	2024-05-07 14:03:06 +12:00
Steven Nguyen	b9e79dfd0c	chore: bump database and update dependencies	2024-05-06 13:34:15 -07:00
Matej Bačo	3a3d5b61a6	PR review changes	2024-05-06 09:55:59 +00:00
Jake Barnby	db94070162	Use DSN for project database	2024-05-06 17:33:36 +12:00
Christy Jacob	95300d796b	Revert "Update chunk size to 7 MB"	2024-05-03 10:19:03 +04:00
Khushboo Verma	885e7019f8	Update chunk size to 10 MB	2024-05-01 23:37:18 +05:30
Jake Barnby	31d4a2ee98	Update database	2024-04-30 13:41:23 +12:00
Khushboo Verma	e2b2df1e31	Fix formatting	2024-04-29 21:18:36 +05:30
Jake Barnby	19be97fae5	Update database	2024-04-29 22:10:32 +12:00
Jake Barnby	ef2a475b6b	Update database	2024-04-29 20:18:37 +12:00
Jake Barnby	a48812649c	Update database ... # Conflicts: # composer.lock	2024-04-29 18:47:30 +12:00
Matej Bačo	5849de5773	Update composer.lock	2024-04-26 13:14:16 +02:00
Matej Bačo	20ff098c2e	Update composer.lock	2024-04-26 13:11:55 +02:00
Damodar Lohani	48e9d93384	upgrade composer	2024-04-25 08:04:04 +00:00
Damodar Lohani	9f436da37c	update sdk generator	2024-04-25 07:27:14 +00:00
Steven Nguyen	b75f5263a2	Merge branch 'main' into chore-sync-main-into-1.5.x	2024-04-23 23:43:53 +00:00
Matej Bačo	7ad7d42106	Update composer.lock	2024-04-17 17:57:28 +02:00
Matej Bačo	487d93bf04	Revert breaking changes	2024-04-16 09:59:02 +02:00
Jake Barnby	114a450f26	Update websockets to release version (no change)	2024-04-11 14:18:31 +12:00
Jake Barnby	4bef6125f7	Use on worker stop to properly reclaim realtime redis connections and unsubscribe	2024-04-09 17:05:44 +12:00
Jake Barnby	a0051eaa81	Update database	2024-04-08 19:59:36 +12:00
Damodar Lohani	a67c6bfacb	update platform version	2024-04-08 05:16:37 +00:00
Damodar Lohani	4d15e0dbd2	update platform version	2024-04-08 05:03:18 +00:00
Jake Barnby	ccf437dac4	Update db for relationships and object as array attributes fixes	2024-04-04 19:56:09 +13:00
Matej Bačo	7c691b3c7c	Fix version missmatch	2024-04-02 13:01:55 +02:00
Matej Bačo	7a25a3c529	Upgrade database lib for ZDT	2024-04-02 11:42:10 +02:00
Eldad Fux	8ed1da4ea8	Updated getEnv to use system lib	2024-04-01 13:02:47 +02:00
fogelito	5ff5c930a5	composer.lock	2024-03-28 13:32:54 +02:00
Steven Nguyen	c6cf4c829e	deps	2024-03-21 18:39:50 +00:00
Steven Nguyen	42e0b055b1	chore(sdks): update dependencies to use updated sdk generator	2024-03-19 22:06:09 +00:00
Christy Jacob	a306cb87d8	chore: update avatars API	2024-03-18 12:07:14 +00:00
Jake Barnby	310aa56e5d	Update db	2024-03-13 19:08:07 +01:00
Steven Nguyen	c9fdfb0f4b	fix(auth): allow wildcards for url validation like oauth success	2024-03-11 15:44:36 +00:00
Jake Barnby	38c8bc613a	Bump generator	2024-03-09 18:36:16 +01:00
Jake Barnby	2c36afe251	Update python	2024-03-09 17:11:27 +01:00
Torsten Dittmann	198567fae7	release: flutter/dart sdks	2024-03-09 12:49:39 +01:00
Jake Barnby	82736b05c7	Bump generator	2024-03-08 16:42:37 +01:00
Jake Barnby	2392e4ae26	Fix specs and versions	2024-03-08 16:09:50 +01:00
Torsten Dittmann	a7171138cd	chore: update lock	2024-03-08 11:26:28 +01:00
Jake Barnby	7d3f8a80ea	Push SDKs	2024-03-08 10:58:46 +01:00
Torsten Dittmann	9631042645	chore: upgrade sdk-generator	2024-03-08 10:10:15 +01:00
Torsten Dittmann	e764b358a0	fix: composer lock	2024-03-06 18:36:26 +01:00
Torsten Dittmann	64a9126398	fix: config	2024-03-06 18:33:32 +01:00
Torsten Dittmann	8f187986d2	feat: pint	2024-03-06 18:13:43 +01:00
Torsten Dittmann	a53e630536	Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2	2024-03-05 10:31:51 +01:00
Christy Jacob	0b4716721d	chore: update composer	2024-03-01 16:16:29 +00:00
Christy Jacob	2ffcb9b07e	Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn	2024-03-01 16:08:03 +00:00
Torsten Dittmann	7fa578c901	Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x	2024-03-01 14:20:32 +01:00
Steven Nguyen	fed197a313	Merge branch '1.4.x' into chore-sync-1.4.x-into-main	2024-02-29 21:53:39 +00:00
Jake Barnby	0e28a3016c	Update lock	2024-02-27 21:54:02 +13:00
Jake Barnby	670d53ee45	Update generator	2024-02-27 18:31:20 +13:00
Jake Barnby	cd554aa17f	Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks ... # Conflicts: # app/config/specs/open-api3-1.5.x-client.json # app/config/specs/open-api3-1.5.x-console.json # app/config/specs/open-api3-1.5.x-server.json # app/config/specs/open-api3-latest-client.json # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-1.5.x-client.json # app/config/specs/swagger2-1.5.x-console.json # app/config/specs/swagger2-1.5.x-server.json # app/config/specs/swagger2-latest-client.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json # composer.lock	2024-02-26 18:43:52 +13:00
Bradley Schofield	450de95c57	Update migration lib and fix typo	2024-02-25 14:09:22 +00:00
Jake Barnby	3fc7d9f0f0	Update generator	2024-02-25 00:17:56 +13:00
Jake Barnby	46575b6df7	Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks ... # Conflicts: # app/controllers/api/account.php # composer.lock	2024-02-25 00:16:40 +13:00
Jake Barnby	40b0b637cf	Remove opcache test	2024-02-24 01:06:53 +13:00
Jake Barnby	6e4eb348c1	Remove preloading	2024-02-23 19:34:54 +13:00
Jake Barnby	7c42a59c85	Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks ... # Conflicts: # app/config/specs/open-api3-latest-client.json # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-latest-client.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json # composer.lock	2024-02-23 18:01:59 +13:00
Jake Barnby	21af8d3913	Revert DB	2024-02-23 01:12:48 +13:00
Jake Barnby	0d4d046d1f	Revert "Revert DB update" ... This reverts commit f3eda05708.	2024-02-23 00:17:25 +13:00
Jake Barnby	f3eda05708	Revert DB update	2024-02-22 23:53:18 +13:00
loks0n	e3c261b9e4	fix: msg91	2024-02-21 16:24:55 +00:00
Jake Barnby	81b9c4dca2	Push SDKs	2024-02-22 00:31:50 +13:00
Jake Barnby	ac619f3b89	Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks ... # Conflicts: # composer.lock	2024-02-21 22:37:32 +13:00