Merge branch 'main' into aggregation

2026-02-07 19:55:05 -05:00 · 2021-06-09 14:16:36 -04:00
parent ecce005226 7ecbe49bb6
commit c2c78792b1
529 changed files with 36532 additions and 32331 deletions
--- a/api/src/types/collection.ts
+++ b/api/src/types/collection.ts
@@ -8,6 +8,7 @@ export type CollectionMeta = {
 	singleton: boolean;
 	icon: string | null;
 	translations: Record<string, string>;
+	item_duplication_fields: string[] | null;
 	accountability: 'all' | 'accountability' | null;
 };