merge origin/dev and resolve frontend conflicts
This commit is contained in:
Vendored
+1
@@ -57,6 +57,7 @@ declare module 'vue' {
|
||||
QueryToolbar: typeof import('./components/common/QueryToolbar.vue')['default']
|
||||
RouterLink: typeof import('vue-router')['RouterLink']
|
||||
RouterView: typeof import('vue-router')['RouterView']
|
||||
SingleLineText: typeof import('./components/common/SingleLineText.vue')['default']
|
||||
WorkspaceTabs: typeof import('./components/WorkspaceTabs.vue')['default']
|
||||
}
|
||||
export interface GlobalDirectives {
|
||||
|
||||
Reference in New Issue
Block a user