Damodar Lohani 95a20159a7 fix merge errors

2021-08-25 12:09:02 +05:45

..

account.php

Update app/controllers/api/account.php

2021-08-19 16:58:32 +05:45

avatars.php

Merge branch 'feat-database-indexing' into feat-custom-id

2021-07-27 11:45:26 +05:45

database.php

fix merge errors

2021-08-25 12:09:02 +05:45

functions.php

update custom id description on all services

2021-08-19 10:37:36 +05:45

graphql.php

Cleaned up globals

2020-06-28 22:28:18 +03:00

health.php

Removed the tasks service

2021-07-27 17:16:12 +03:00

locale.php

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

2021-08-05 11:25:36 +03:00

projects.php

collections count

2021-08-24 16:15:24 +05:45

storage.php

Merge branch 'feat-database-indexing' into feat-usage-daemon

2021-08-19 11:12:49 +05:45

teams.php

update custom id description on all services

2021-08-19 10:37:36 +05:45

users.php

Merge branch 'feat-database-indexing' into feat-usage-daemon

2021-08-19 11:12:49 +05:45