Merge branch 'develop' into bug/sev3/automation-mysql-id-relationship-uri-decode

packages/server/src/startup.ts

@@ -18,7 +18,7 @@ import fileSystem from "./utilities/fileSystem"
 import eventEmitter from "./events"
 import * as migrations from "./migrations"
 import bullboard from "./automations/bullboard"
-import * as pro from "../../../../budibase-pro/packages/pro"
+import * as pro from "@budibase/pro"
 import api from "./api"
 import sdk from "./sdk"
 const pino = require("koa-pino-logger")

packages/types/src/documents/app/backup.ts

@@ -34,6 +34,8 @@ export interface AppBackupMetadata {
   name?: string
   createdBy?: string | User
   timestamp: string
+  finishedAt?: string
+  startedAt?: string
   contents?: AppBackupContents
 }