Commit Graph

4 Commits

Author SHA1 Message Date
まっちゃとーにゅ abe95d9b67
Merge branch 'develop' of misskey-dev into merge-upstream 2024-01-10 03:13:22 +09:00
Chocolate Pie 072f67d6e7
feat: Add support for mCaptcha (#12905)
* feat: Add support for mCaptcha

* fix: Fix docker compose configuration

* chore(frontend/docs): update changelog & fix eslint errors

* `@mcaptcha/vanilla-glue`をダイナミックインポートするように

* chore: Add missing prefix to CHANGELOG

* refactor(backend): 適当につけた変数の名前を変更
2024-01-06 20:14:33 +09:00
riku6460 e77ddfce91
Merge tag '2023.12.0-beta.3' into merge-upstream 2023-12-10 10:29:33 +09:00
nullnyat 5cd4c36cad
rename docker-compose.yml.example to docker-compose_example.yml (#12530)
* rename docker-compose.yml.example to docker-compose_example.yml

* fix: dockle.yml
2023-12-01 11:19:33 +09:00