Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
# Conflicts: # CHANGELOG.md # packages/backend/src/core/activitypub/models/ApNoteService.ts # packages/backend/src/core/entities/AbuseUserReportEntityService.ts # packages/frontend/src/components/MkNotification.vue # packages/frontend/src/pages/user/home.vue # pnpm-lock.yaml
This commit is contained in:
commit
fd4fd5aa7b
81 changed files with 493 additions and 557 deletions
2
.github/workflows/docker.yml
vendored
2
.github/workflows/docker.yml
vendored
|
|
@ -48,7 +48,7 @@ jobs:
|
|||
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||
- name: Build and Push to Docker Hub
|
||||
id: build
|
||||
uses: docker/build-push-action@v5
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue