Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (d2aba9b6) · 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

d2aba9b6

Commit d2aba9b6 authored 2 years ago by tamaina

Downloads
- Plain Diff

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

parents 6c5b5f59 973e70ba

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.devcontainer/devcontainer.json 4 additions, 1 deletion

.devcontainer/devcontainer.json
locales/ja-JP.yml 2 additions, 0 deletions

locales/ja-JP.yml
packages/frontend/src/components/MkImgWithBlurhash.vue 34 additions, 13 deletions

packages/frontend/src/components/MkImgWithBlurhash.vue
packages/frontend/src/components/MkMediaImage.vue 5 additions, 4 deletions

packages/frontend/src/components/MkMediaImage.vue
packages/frontend/src/components/MkMediaList.vue 70 additions, 7 deletions

packages/frontend/src/components/MkMediaList.vue
packages/frontend/src/components/MkRadio.vue 1 addition, 1 deletion

packages/frontend/src/components/MkRadio.vue
packages/frontend/src/components/MkRadios.vue 8 additions, 6 deletions

packages/frontend/src/components/MkRadios.vue
packages/frontend/src/pages/settings/general.vue 9 additions, 0 deletions

packages/frontend/src/pages/settings/general.vue
packages/frontend/src/pages/settings/preferences-backups.vue 1 addition, 0 deletions

packages/frontend/src/pages/settings/preferences-backups.vue
packages/frontend/src/store.ts 4 additions, 0 deletions

packages/frontend/src/store.ts

with 138 additions and 32 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