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

7b29e36d

Commit 7b29e36d authored 2 years ago by tamaina

Downloads
- Plain Diff

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

parents 9cc36ef3 2d11c558

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 4 additions, 2 deletions

CHANGELOG.md
locales/de-DE.yml 9 additions, 0 deletions

locales/de-DE.yml
locales/en-US.yml 9 additions, 0 deletions

locales/en-US.yml
locales/es-ES.yml 8 additions, 1 deletion

locales/es-ES.yml
locales/ja-KS.yml 44 additions, 5 deletions

locales/ja-KS.yml
locales/lo-LA.yml 82 additions, 0 deletions

locales/lo-LA.yml
locales/th-TH.yml 5 additions, 0 deletions

locales/th-TH.yml
locales/zh-CN.yml 11 additions, 1 deletion

locales/zh-CN.yml
locales/zh-TW.yml 8 additions, 0 deletions

locales/zh-TW.yml
package.json 1 addition, 1 deletion

package.json
packages/frontend/src/components/MkMediaBanner.vue 2 additions, 2 deletions

packages/frontend/src/components/MkMediaBanner.vue

with 183 additions and 12 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