Merge conflicts

This commit is contained in:
Louis Lam 2023-10-09 21:32:40 +08:00
parent 852b3fa61b
commit 45b6fab313
3 changed files with 2268 additions and 2073 deletions

View File

@ -275,7 +275,7 @@ async function createTables() {
table.boolean("active").notNullable().defaultTo(true);
table.integer("user_id").unsigned();
table.boolean("is_default").notNullable().defaultTo(false);
table.text("config");
table.text("config", "longtext");
});
// monitor_notification

4339
package-lock.json generated

File diff suppressed because it is too large Load Diff