curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-24 04:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse Source 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/settings/theme.vue
This commit is contained in:
mattyatea
2024-02-09 10:14:24 +09:00
parent 557b5a7beb 614c9a0fc6
commit dfd491ff85
119 changed files with 1030 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,12 +1,12 @@
{
"name": "misskey",
"version": "2024.2.0-beta.9-PrisMisskey.3",
"version": "2024.2.0-beta.10-PrisMisskey.1",
"codename": "nasubi",
"repository": {
"type": "git",
"url": "https://github.com/misskey-dev/misskey.git"
},
"packageManager": "pnpm@8.12.1",
"packageManager": "pnpm@8.15.1",
"workspaces": [
"packages/frontend",
"packages/backend",