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

bd720491

Unverified Commit bd720491 authored 6 years ago by syuilo

Downloads
- Plain Diff

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

parents a4082265 de47a17b

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

package.json 2 additions, 0 deletions

package.json
src/client/app/desktop/views/components/context-menu.menu.vue 1 addition, 1 deletion

...client/app/desktop/views/components/context-menu.menu.vue
src/client/app/desktop/views/components/drive.file.vue 3 additions, 1 deletion

src/client/app/desktop/views/components/drive.file.vue
src/client/app/mobile/views/components/drive.file-detail.vue 6 additions, 1 deletion

src/client/app/mobile/views/components/drive.file-detail.vue
src/prelude/url.ts 4 additions, 0 deletions

src/prelude/url.ts
src/server/file/send-drive-file.ts 6 additions, 1 deletion

src/server/file/send-drive-file.ts

with 22 additions and 4 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