MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mel O'Hagan 2022-10-27 17:35:47 +01:00
parent 4403b2fb22 0e59c84353
commit 7f1b81dd7a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/startup.ts
View File

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

2
packages/types/src/documents/app/backup.ts
View File

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