resolve merge conflict

2023-02-12 06:15:27 +01:00
parent 0a58280f3d
commit 0e00805187
83 changed files with 1733 additions and 1101 deletions
@@ -0,0 +1,7 @@
+<script lang="ts">
+	import immichLogoUrl from '$lib/assets/immich-logo.svg';
+
+	export let draggable = false;
+</script>
+
+<img src={immichLogoUrl} alt="Immich Logo" {draggable} {...$$restProps} />