Merge remote-tracking branch 'origin/master' into collection-view

# Conflicts: # openapi/cineast/.openapi-generator/FILES # openapi/cineast/api/misc.service.ts # openapi/cineast/api/object.service.ts # openapi/cineast/model/queryConfig.ts # openapi/cineast/model/temporalQuery.ts # openapi/cineast/model/temporalQueryConfig.ts # package-lock.json # package.json # src/app/query/containers/query-container.component.html # src/app/shared/model/results/scores/results-container.model.ts # src/config.json
vitrivr · Apr 26, 2022 · c73c263 · c73c263
2 parents a7c2126 + 7b7e0be
commit c73c263
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/openapi/cineast/model/mediaObjectMetadataDescriptor.ts b/openapi/cineast/model/mediaObjectMetadataDescriptor.ts
@@ -17,5 +17,6 @@ export interface MediaObjectMetadataDescriptor {
     key?: string;
     value?: string;
     exists?: boolean;
+    objectId?: string;
 }