diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-04-03 22:04:11 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-04-03 22:06:37 -0400 |
| commit | 3eeb53ff63a5e776327a9fd067d0c74b9dc727f4 (patch) | |
| tree | 9b4ee01e1aaf1ab7b4a24ab897ccf14e1aa19a40 /package.json | |
| parent | refactor bubble-timeline.ts to match global-timeline.ts and local-timeline.ts (diff) | |
| parent | New Crowdin updates (#15740) (diff) | |
| download | sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.tar.gz sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.tar.bz2 sharkey-3eeb53ff63a5e776327a9fd067d0c74b9dc727f4.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# package.json
# packages/backend/src/core/AccountMoveService.ts
# packages/frontend/src/components/MkDateSeparatedList.vue
# packages/misskey-js/etc/misskey-js.api.md
# pnpm-lock.yaml
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index c5163f8f4e..cc6bea1d11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2025.4.0-beta.1", + "version": "2025.4.0-rc.0", "codename": "shonk", "repository": { "type": "git", |