Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (88ac0de0) · Commits · Dima Krasner / Sharkey · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Sharkey
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

88ac0de0

Commit 88ac0de0 authored 3 years ago by syuilo

Downloads
- Plain Diff

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

parents 108ec412 9c564350

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.github/dependabot.yml 15 additions, 4 deletions

.github/dependabot.yml
locales/ja-JP.yml 2 additions, 0 deletions

locales/ja-JP.yml
packages/backend/migration/1644010796173-convert-hard-mutes.js 64 additions, 0 deletions

...ges/backend/migration/1644010796173-convert-hard-mutes.js
packages/backend/package.json 1 addition, 1 deletion

packages/backend/package.json
packages/backend/src/misc/check-word-mute.ts 18 additions, 13 deletions

packages/backend/src/misc/check-word-mute.ts
packages/backend/src/server/api/endpoints/i/update.ts 20 additions, 1 deletion

packages/backend/src/server/api/endpoints/i/update.ts
packages/backend/yarn.lock 28 additions, 17 deletions

packages/backend/yarn.lock
packages/client/src/pages/settings/word-mute.vue 51 additions, 4 deletions

packages/client/src/pages/settings/word-mute.vue
packages/client/src/scripts/check-word-mute.ts 18 additions, 13 deletions

packages/client/src/scripts/check-word-mute.ts
packages/client/yarn.lock 38 additions, 25 deletions

packages/client/yarn.lock

with 255 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment