Merge branch 'develop' into feature/config-dropdir (8b31c126) · 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

8b31c126

Commit 8b31c126 authored 1 year ago by Trivernis

Downloads
- Plain Diff

Merge branch 'develop' into feature/config-dropdir

parents 64d34f59 dd22d7b6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

packages/backend/package.json 1 addition, 1 deletion

packages/backend/package.json
packages/frontend/package.json 2 additions, 1 deletion

packages/frontend/package.json
packages/frontend/src/components/MkFormula.vue 33 additions, 0 deletions

packages/frontend/src/components/MkFormula.vue
packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts 11 additions, 3 deletions

...ontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
packages/frontend/src/pages/settings/mute-block.vue 3 additions, 3 deletions

packages/frontend/src/pages/settings/mute-block.vue
packages/frontend/src/scripts/autocomplete.ts 1 addition, 1 deletion

packages/frontend/src/scripts/autocomplete.ts
pnpm-lock.yaml 21 additions, 6 deletions

pnpm-lock.yaml

with 72 additions and 15 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