diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-10 09:52:35 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-10 23:34:52 -0500 |
| commit | 363111f5deaa4c04b4645a2d2779ebc12b531cf6 (patch) | |
| tree | 876d9cf89e2f84b082d008e086afd4676fc87f33 /packages/backend/src/server/api/endpoints/users/relation.ts | |
| parent | add some missing translations (diff) | |
| parent | merge: Add ability to generate vapid keys on frontend (!888) (diff) | |
| download | sharkey-363111f5deaa4c04b4645a2d2779ebc12b531cf6.tar.gz sharkey-363111f5deaa4c04b4645a2d2779ebc12b531cf6.tar.bz2 sharkey-363111f5deaa4c04b4645a2d2779ebc12b531cf6.zip | |
Merge branch 'develop' into merge/2024-02-03
# Conflicts:
# locales/index.d.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/misskey-js/src/autogen/endpoint.ts
# sharkey-locales/en-US.yml
Diffstat (limited to 'packages/backend/src/server/api/endpoints/users/relation.ts')
0 files changed, 0 insertions, 0 deletions