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

2334b413

Unverified Commit 2334b413 authored 6 years ago by syuilo

Downloads
- Plain Diff

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

parents 6f6974a6 0854f2e1

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

locales/ja-JP.yml
src/client/app/admin/views/users.vue 14 additions, 2 deletions

src/client/app/admin/views/users.vue
src/server/api/common/getters.ts 42 additions, 0 deletions

src/server/api/common/getters.ts
src/server/api/endpoints/admin/update-remote-user.ts 36 additions, 0 deletions

src/server/api/endpoints/admin/update-remote-user.ts

with 94 additions and 2 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