diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-07 11:54:29 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-07 11:57:44 -0500 |
| commit | f36029f795ed1615b804d66149eaaf450fa36f64 (patch) | |
| tree | 4c8ca21665ef1662bc21231ecd50b451e917fd44 /packages/backend/src/server/FileServerService.ts | |
| parent | restore support for local dev using a non-local `url` (diff) | |
| parent | merge: Add "follow back" button on follow-related notifications (resolves #89... (diff) | |
| download | sharkey-f36029f795ed1615b804d66149eaaf450fa36f64.tar.gz sharkey-f36029f795ed1615b804d66149eaaf450fa36f64.tar.bz2 sharkey-f36029f795ed1615b804d66149eaaf450fa36f64.zip | |
Merge branch 'develop' into merge/2024-02-03
# Conflicts:
# locales/index.d.ts
# packages/backend/src/core/entities/UserEntityService.ts
# packages/frontend/src/_dev_boot_.ts
# packages/misskey-js/src/autogen/types.ts
# sharkey-locales/en-US.yml
Diffstat (limited to 'packages/backend/src/server/FileServerService.ts')
0 files changed, 0 insertions, 0 deletions