mattyatea 69c16f036c Merge remote-tracking branch 'misskey-original/develop' into develop ... # Conflicts: # locales/index.d.ts # locales/ja-JP.yml # package.json # packages/frontend/src/pages/about.vue # packages/frontend/src/scripts/get-note-menu.ts		2024-02-17 13:45:01 +09:00
..
docker_example.env	feat: Add support for mCaptcha (#12905)	2024-01-06 20:14:33 +09:00
docker_example.yml	Fix(backend): inboxJobPerSecのデフォルト値を16から32に (#12631)	2023-12-13 08:14:34 +09:00
example.yml	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-02-17 13:45:01 +09:00