Jake Barnby a47bfe71bf Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support ... # Conflicts: # CHANGES.md # composer.json # composer.lock # tests/e2e/Services/Functions/FunctionsCustomServerTest.php		2022-11-04 21:32:57 +13:00
..
config	Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support	2022-11-04 21:32:57 +13:00
controllers	Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support	2022-11-04 21:32:57 +13:00
db/DBIP	Merge branch 'appwrite:master' into feat-XXX-authentik-oauth	2022-07-06 11:02:59 +02:00
tasks	Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x	2022-10-31 09:45:51 +01:00
views	Merge remote-tracking branch 'origin/1.0.x' into feat-integrate-messaging	2022-10-10 14:01:59 +13:00
workers	fix: builds worker buildTime	2022-10-31 12:47:41 +01:00
cli.php	format files in app, src, tests	2022-05-23 14:54:50 +00:00
executor.php	Rename req.env to req.variables in runtime container	2022-09-13 00:49:08 +00:00
http.php	Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x	2022-11-01 22:21:19 +05:30
init.php	Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x	2022-10-31 09:45:51 +01:00
preload.php	feat: update database library	2022-10-31 12:02:51 +00:00
realtime.php	adapter change	2022-10-26 23:05:25 +03:00