heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
24496 commits 2 branches 0 tags 162 MiB
Commit graph

120 commits

Author SHA1 Message Date
anatawa12
7e15f71916
ci: fix pullreq number may not get correctly (#12127) 
* Revert "remove save-pr-number"

This reverts commit 085f4bd76992fa0b3e4219a5c132b72f68c3d2cc.

* Revert "Update report-api-diff.yml"

This reverts commit b73daf4c0ec4240ea39b183a6b93f209b63e6d81.

* Revert "Update report-api-diff.yml"

This reverts commit cbf2b5ad8a7cba769446fa9bcf1f129c6f03db8c.

* Revert "try to get pull request id from github.event.workflow_run.pull_requests"

This reverts commit 07517ce501c12e75da03d325c23968d75ac37d00.
 2023-10-24 14:02:06 +09:00
anatawa12
b22066b9a2
ci: fix pull_req時にAPI diffの実行ができない (#12123) 
* initial commit for report-api-diff.yml

* add api-{base,head}.json into api-artifact

* try to get pull request id from github.event.workflow_run.pull_requests

* Update report-api-diff.yml

* Update report-api-diff.yml

* remove save-pr-number
 2023-10-24 06:16:40 +09:00
taichan
3e5c55c14e
chore: Pull Request時にapi.jsonの差分を表示するActions workflow (#12090) 
* chore: Pull Request時にapi.jsonのdiffを出力するworkflow

* refactor: job names

* fix: set repository to get api diff

* chore: set permission to workflow

* set sleep 30s (shorter)

* chore: set label of diff

* chore: more attempts to fetch misskey

* chore: add full diff output of api.js

* chore: save full-diff to Artifact

* chore: add message to download diff Artifact
 2023-10-21 07:45:47 +09:00
dependabot[bot]
3c3d05ba2e
chore(deps): bump actions/checkout from 4.1.0 to 4.1.1 (#12062) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-10-19 19:35:13 +09:00
dependabot[bot]
2039e244c5
build(deps): bump actions/checkout from 4.0.0 to 4.1.0 (#11900) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-25 16:05:02 +09:00
dependabot[bot]
efa66ae89a
build(deps): bump docker/metadata-action from 4 to 5 (#11828) 
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-13 16:08:30 +09:00
dependabot[bot]
6124772a5f
build(deps): bump docker/setup-buildx-action from 2.10.0 to 3.0.0 (#11827) 
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.10.0 to 3.0.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2.10.0...v3.0.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-13 16:08:22 +09:00
dependabot[bot]
d28fe24d0b
build(deps): bump docker/login-action from 2 to 3 (#11829) 
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-13 16:08:10 +09:00
dependabot[bot]
ba28f90fd1
build(deps): bump docker/build-push-action from 4 to 5 (#11826) 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-13 16:08:00 +09:00
dependabot[bot]
f9fc743c05
build(deps): bump tibdex/github-app-token from 1 to 2 (#11815) 
Bumps [tibdex/github-app-token](https://github.com/tibdex/github-app-token) from 1 to 2.
- [Release notes](https://github.com/tibdex/github-app-token/releases)
- [Commits](https://github.com/tibdex/github-app-token/compare/v1...v2)

---
updated-dependencies:
- dependency-name: tibdex/github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-11 19:42:42 +09:00
syuilo
dc1a91a5b2 fix(dev): use 20.5.1 instead of 20.x 
Fix #11793
 2023-09-07 16:38:47 +09:00
dependabot[bot]
c5af9e371c
build(deps): bump actions/checkout from 3.6.0 to 4.0.0 (#11786) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.6.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-09-05 17:15:53 +09:00
syuilo
1f7a81aae7
update deps (#11764) 
* update deps

* node16

* wip

* wip

* wip

* Update test-utils.ts

* wip

* Update tsconfig.json

* wip

* Update package.json

* wip

* Update following.vue

* Update followers.vue

* Update index.vue

* Update share.vue

* Update MkUserPopup.vue

* Update MkPostForm.vue

* wip

* Update MkTokenGenerateWindow.vue

* Update MkPagination.vue

* refactor

* update deps

* update deps

* Update sw.ts

* wip

* wip

* wip

* Update FetchInstanceMetadataService.ts

* Update FetchInstanceMetadataService.ts

* update node

* update deps

* 🎨
 2023-09-04 13:33:38 +09:00
dependabot[bot]
23102a2c08
build(deps): bump docker/setup-buildx-action from 2.9.1 to 2.10.0 (#11769) 
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.9.1 to 2.10.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2.9.1...v2.10.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-29 21:17:02 +09:00
dependabot[bot]
39eb86f5af
build(deps): bump actions/checkout from 3.5.3 to 3.6.0 (#11762) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.5.3...v3.6.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-27 09:21:07 +09:00
dependabot[bot]
e82c2e7cf9
build(deps): bump cypress-io/github-action from 5 to 6 (#11758) 
Bumps [cypress-io/github-action](https://github.com/cypress-io/github-action) from 5 to 6.
- [Release notes](https://github.com/cypress-io/github-action/releases)
- [Changelog](https://github.com/cypress-io/github-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/github-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: cypress-io/github-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-22 15:58:10 +09:00
dependabot[bot]
e6032a03b6
build(deps): bump actions/setup-node from 3.8.0 to 3.8.1 (#11739) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.8.0...v3.8.1)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-19 18:39:39 +09:00
dependabot[bot]
9264ca336b
build(deps): bump actions/setup-node from 3.7.0 to 3.8.0 (#11726) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.7.0...v3.8.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-15 18:25:12 +09:00
dependabot[bot]
8b7f54df66
build(deps): bump uesteibar/reviewer-lottery from 2 to 3 (#11500) 
Bumps [uesteibar/reviewer-lottery](https://github.com/uesteibar/reviewer-lottery) from 2 to 3.
- [Release notes](https://github.com/uesteibar/reviewer-lottery/releases)
- [Commits](https://github.com/uesteibar/reviewer-lottery/compare/v2...v3)

---
updated-dependencies:
- dependency-name: uesteibar/reviewer-lottery
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-13 12:25:57 +09:00
dependabot[bot]
f3bbf8417c
build(deps): bump peter-evans/slash-command-dispatch from 1 to 3 (#11501) 
Bumps [peter-evans/slash-command-dispatch](https://github.com/peter-evans/slash-command-dispatch) from 1 to 3.
- [Release notes](https://github.com/peter-evans/slash-command-dispatch/releases)
- [Commits](https://github.com/peter-evans/slash-command-dispatch/compare/v1...v3)

---
updated-dependencies:
- dependency-name: peter-evans/slash-command-dispatch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-13 12:25:48 +09:00
dependabot[bot]
748d4ebaae
build(deps): bump docker/setup-buildx-action from 2.3.0 to 2.9.1 (#11502) 
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.3.0 to 2.9.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2.3.0...v2.9.1)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-08-13 12:25:30 +09:00
dependabot[bot]
f5985d53e5 build(deps): bump actions/checkout from 3.2.0 to 3.5.3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.5.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.2.0...v3.5.3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-12 13:35:29 +02:00
Kagami Sascha Rosylight
71ca6fe7b5 chore(workflows): use checkout@v3.3.0 consistently 2023-08-12 13:16:24 +02:00
dependabot[bot]
6b21b142bd build(deps): bump actions/setup-node from 3.6.0 to 3.7.0 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.6.0...v3.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-12 13:14:21 +02:00
syuilo
f76b3edbdd update node to 20.4.0 2023-07-07 13:58:43 +09:00
Acid Chicken (硫酸鶏)
9a6ce1e867
ci: fix head user 2023-05-20 18:52:08 +00:00
Acid Chicken (硫酸鶏)
22a6bd6b22
ci: fix branch name 2023-05-20 14:03:05 +00:00
Acid Chicken (硫酸鶏)
6173cebdca
ci: remove deprecated notifications 2023-05-18 08:05:09 +00:00
Acid Chicken (硫酸鶏)
6bb82cda37
ci: use actual base 2023-05-18 14:16:07 +09:00
Acid Chicken (硫酸鶏)
747d323584
ci: fix breaking on foreign repos 2023-05-17 07:39:36 +00:00
Acid Chicken (硫酸鶏)
909ec8c38d
ci: fix missing branch 2023-05-11 22:21:48 +09:00
Acid Chicken (硫酸鶏)
b01a1b3c17
ci: notify on changes for push events 2023-05-11 22:20:26 +09:00
Acid Chicken (硫酸鶏)
69afd0480e
ci: fix typo 2023-05-10 10:33:49 +00:00
Acid Chicken (硫酸鶏)
3510768fd5
ci: check for PRs (#10804) 
* ci: check for PRs

* ci: run all PRs

* ci: fix syntax error

* ci: comment on PRs only

* ci: use pull_request_target
 2023-05-08 15:14:42 +00:00
tamaina
2d3d986d13
test: Check availability of production build (#10734) 2023-04-29 23:21:54 +09:00
tamaina
6e0f998fb2 test: use pnpm v8 2023-04-26 15:17:40 +00:00
syuilo
0f7defc14a Update test-frontend.yml 2023-04-19 16:42:14 +09:00
Kohei Ota (inductor)
5a8748b2b0
Update node version (#10639) 2023-04-15 10:20:39 +09:00
Acid Chicken (硫酸鶏)
a432f53d6c
ci: avoid 0000000 2023-04-08 07:16:10 +00:00
Acid Chicken (硫酸鶏)
79f198e4f1
ci: ignore develop commits 2023-04-07 23:27:22 +09:00
Acid Chicken (硫酸鶏)
abda3b6c8c
ci(#10336): use TurboSnap (#10494) 
* ci(#10336): use TurboSnap

* build: fix version

* ci(#10336): update build dir

* chore(#10336): fire changes

* chore: stabilize icon width on `PageHeader`

* chore: fire changes

* ci: invalid ignore

* ci: trace logs

* chore: debug

* revert: debug

This reverts commit 2329165e252640504ef17e97389e0460ada83e70.

* chore: do not reuse build dir

* build: scripts

* ci: tweak

* revert: re-revert debug

This reverts commit 596ef05d9eabe11c0ec3125fa4a87071d59b9b2f.

* chore: detect changes manually

* fix: syntax

* ci: do not use only-changed

* ci: fix command

* revert: re-re-revert debug

This reverts commit b027170d7504277006ce9abac386df8c38d55fd2.

* ci: use build dir

* revert: re-re-re-revert debug

This reverts commit 529ab126ed63ec10eeeaaee3e9ef581b75e739c9.

* ci: fix path

* revert: re-re-re-re-revert debug

This reverts commit 0b0c0b9ea48d37d617b777e9f602ccf8a2400381.

* ci: fix typo

* ci: only show story files

* revert: re-re-re-re-re-revert debug

This reverts commit 9f5b88df3225f23efd72bb099cfebe359af7acdb.

* ci: skip when no stories found

* ci: use skip

* revert: re-re-re-re-re-re-revert debug

This reverts commit 0df4bdc30bbf425c8682594d500a6d986517e721.

* ci: fix micromatch version

* revert: re-re-re-re-re-re-re-revert debug

This reverts commit 63063b02bbcb37e85b93afe3f919b185425ddcf0.

* revert: re-re-re-re-re-re-re-re-revert debug

This reverts commit 01d9669e2a2c758c478bad5379fe19768e2096bc.

* chore: pin tabler icon width globally

* ci: notify when Chromatic skips

* ci: fix endpoint

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-04-07 20:34:23 +09:00
syuilo
fd05826187 fix(ci): use redis 7 2023-04-06 10:30:06 +09:00
Acid Chicken (硫酸鶏)
712c60106a
ci: fix syntax 2023-04-05 18:35:23 +00:00
Acid Chicken (硫酸鶏)
41aafdea00
test(#10336): stabilize MkError stories 2023-04-06 03:10:45 +09:00
Acid Chicken (硫酸鶏)
38d0b62167
build(#10336): Storybook & Chromatic & msw (#10365) 
* build(#10336): init

* fix(#10336): invalid name conversion

* build(#10336): load locales and vite config

* refactor(#10336): remove unused imports

* build(#10336): separate definitions and generated codes

* refactor(#10336): remove hatches

* refactor(#10336): module semantics

* refactor(#10336): remove unused common preferences

* fix: typo

* build(#10336): mock assets

* build(#10336): impl `SatisfiesExpression`

* build(#10336): control themes

* refactor(#10336): semantics

* build(#10336): make .storybook as an individual TypeScript project

* style(#10336): use single quote

* build(#10336): avoid intrinsic component names

* chore: suppress linter

* style: typing

* build(#10336): update dependencies

* docs: note about Storybook

* build(#10336): sync

* build(#10336): full reload server on change

* chore: use defaultStore instead

* build(#10336): show popups on Story

* refactor(#10336): remove redundant div

* docs: fix

* build(#10336): interactions

* build(#10336): add an interaction test for `<MkA/>`

* build(#10336): bump storybook

* docs(#10336): mention to pre-build misskey-js

* build(#10336): write stories for `MkAcct`

* build(#10336): write stories for `MkAd`

* build(#10336): fix missing type definition

* build(#10336): use `toHaveTextContent`

* build(#10336): write some stories

* build(#10336): hide internal args

* build(#10336): generate `components/global` stories only

* build(#10336): write stories for `MkMisskeyFlavoredMarkdown`

* fix: conflict errors

* build(#10336): subcomponents on sidebar

* refactor: restore `SatisfiesExpression`

* docs(#10336): note development status

* build(#10336): use chokidar-cli

* docs(#10336): note chokidar-cli mode

* chore(#10336): untrack generated stories files

* fix: pointer handling

* build(#10336): finalize

* chore: add static option to `MkLoading`

* refactor(#10336): bind to local args

* fix: missing case

* revert: restore `SatisfiesExpression`

This reverts commit f246699f38.

* build(#10336): make storybook buildable

* build(#10336): staticify assets

* build(#10336): staticified directory structure

* build(#10336): normalize path for Windows

* ci(#10336): create actions

* build(#10336): ignore tsc errors

* build(#10336): ignore tsc errors

* build(#10336): missing dependencies

* build(#10336): missing dependencies

* build(#10336): use fast-glob

* fix: invalid lockfile

* ci(#10336): increase heap size

* build(#10336): use unpkg for storybook tabler icons

* build(#10336): use unpkg for storybook twemojis

* build(#10336): disable `ProfilePageCat`

* build(#10336): blur `MkA` before interaction ends

* ci(#10336): stabilize

* ci(#10336): fetch-depth

* build(#10336): isChromatic

* ci(#10336): notify on changes

* ci(#10336): fix typo

* ci(#10336): missing working directory

* ci(#10336): skip build

* ci(#10336): fix path

* build(#10336): fails on Windows

* build(#10336): available on Windows

* ci(#10336): disable animation on chromatic

* ci(#10336): add static option to `PageHeader.tabs`

* chore: void

* ci(#10336): change parameters

* docs(#10336): update CONTRIBUTING

* docs(#10336): note about meta overriding and etc.

* ci(#10336): use Chromatic for checks

* ci(#10336): use `pull_request` instead of `pull_request_target` for now

* ci(#10336): use `exitOnceUploaded`

* ci(#10336): reuse built storybook

* ci(#10336): back to `pull_request_target`

* chore: unused dependencies

* style(#10336): reduce prettier indents

* style: note about `TSSatisfiesExpression`
 2023-04-04 09:38:34 +09:00
syuilo
74e0824b1d Revert "Update api-misskey-js.yml" 
This reverts commit 231b54a889.
 2023-03-30 13:56:48 +09:00
syuilo
231b54a889 Update api-misskey-js.yml 2023-03-30 13:55:17 +09:00
Kagami Sascha Rosylight
cee1d5e2d0
chore: integrate misskey-js as a workspace item (git subtree) (#10409) 
* Additional changes for the merge

* api-misskey-js
 2023-03-30 09:33:19 +09:00
Kagami Sascha Rosylight
abdb43c440 Revert "Additional changes for the merge" 
This reverts commit efb5e1d1cc.
 2023-03-25 08:20:34 +01:00
Kagami Sascha Rosylight
efb5e1d1cc Additional changes for the merge 2023-03-25 08:13:30 +01:00