Torsten Dittmann cbc630e1b6 fix merge conflicts

2021-10-25 16:51:39 +02:00

..

config

fix merge conflicts

2021-10-25 16:51:39 +02:00

controllers

Merge branch 'master' of https://github.com/appwrite/appwrite into feat-database-indexing

2021-10-25 16:01:07 +02:00

db

chore(geodb): update maxmind db to 2021-10

2021-10-15 12:34:53 +02:00

tasks

Merge branch 'master' of https://github.com/appwrite/appwrite into feat-database-indexing

2021-10-25 16:01:07 +02:00

views

fix merge conflicts

2021-10-25 16:51:39 +02:00

workers

fix functions and users

2021-10-08 10:39:37 +02:00

cli.php

depricate worker.php, use init.php instead

2021-08-13 14:24:46 +05:45

http.php

fix realtime with db refactor

2021-10-07 17:35:17 +02:00

init.php

Merge branch 'master' of https://github.com/appwrite/appwrite into feat-database-indexing

2021-10-25 16:01:07 +02:00

preload.php

Merge branch 'master' of https://github.com/appwrite/appwrite into sync-realtime-with-db-refactor

2021-09-30 12:32:10 +02:00

realtime.php

fix realtime with db refactor

2021-10-07 17:35:17 +02:00