curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-22 03:53:35 +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/core/QueueService.ts
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/clicker.vue
#	packages/frontend/src/pages/my-lists/index.vue
#	packages/frontend/src/pages/notifications.vue
#	packages/frontend/src/pages/settings/emoji-picker.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/universal.vue
#	pnpm-lock.yaml
This commit is contained in:
mattyatea
2024-02-16 19:40:51 +09:00
parent 81d0709249 5e317eac8c
commit 2b52a215e5
238 changed files with 3369 additions and 3002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "misskey",
"version": "2024.2.0-beta.11-PrisMisskey.1",
"version": "2024.2.0-beta.12-PrisMisskey.1",
"codename": "nasubi",
"repository": {
"type": "git",