Merge remote-tracking branch 'misskey-dev/develop' into rainbow

# Conflicts: # package.json # packages/frontend/src/components/MkMenu.vue
2023-09-23 15:48:34 +09:00 · 2023-09-23 15:48:34 +09:00 · aec6bccbdf
commit aec6bccbdf
parent 4e846b29b9 ba6e85482e
26 changed files with 622 additions and 479 deletions
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -414,6 +414,9 @@ export type Plugin = {
 	src: string | null;
 	version: string;
 	ast: any[];
+	author?: string;
+	description?: string;
+	permissions?: string[];
 };

 interface Watcher {