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

f6c6ffaf

Commit f6c6ffaf authored 2 years ago by syuilo

Downloads
- Plain Diff

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

parents 5c88c17d c5471223

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.devcontainer/devcontainer.json 15 additions, 4 deletions

.devcontainer/devcontainer.json
.dockerignore 2 additions, 0 deletions

.dockerignore
.gitignore 3 additions, 0 deletions

.gitignore
.vscode/extensions.json 4 additions, 1 deletion

.vscode/extensions.json
Dockerfile 32 additions, 14 deletions

Dockerfile
chart/templates/Deployment.yml 3 additions, 3 deletions

chart/templates/Deployment.yml
chart/templates/Service.yml 1 addition, 1 deletion

chart/templates/Service.yml
locales/ja-JP.yml 1 addition, 0 deletions

locales/ja-JP.yml
packages/backend/package.json 1 addition, 0 deletions

packages/backend/package.json
packages/backend/src/misc/is-mime-image.ts 2 additions, 0 deletions

packages/backend/src/misc/is-mime-image.ts
packages/backend/src/server/FileServerService.ts 8 additions, 7 deletions

packages/backend/src/server/FileServerService.ts
packages/frontend/src/pages/settings/email.vue 6 additions, 1 deletion

packages/frontend/src/pages/settings/email.vue
pnpm-lock.yaml 42 additions, 3 deletions

pnpm-lock.yaml

with 120 additions and 34 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