diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-05-21 20:34:30 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-05-21 20:34:30 -0400 |
| commit | 442f5608aeddb5c627183e150a8c79c9d5bd2a57 (patch) | |
| tree | 4346360538d0a50407ce7d76a5e8ce6b168c52aa /src/assets | |
| parent | b4a4639f2ed05c02b9061d9febddf8339bc1fe26 (diff) | |
| parent | 4849c65ff2163e1a77dcb26a12ff68840df225e7 (diff) | |
Merge branch 'master' into tma853-tag-selection-screen
# Conflicts:
# src/components/common/index.ts
# src/screens/profile/CaptionScreen.tsx
Diffstat (limited to 'src/assets')
| -rw-r--r-- | src/assets/icons/tag-icon.png | bin | 0 -> 1708 bytes |
| -rw-r--r-- | src/assets/images/Tagg-Triangle.png | bin | 0 -> 561 bytes |
| -rw-r--r-- | src/assets/images/draggableX.png | bin | 0 -> 1780 bytes |
| -rw-r--r-- | src/assets/images/tagg-rectangle.png | bin | 0 -> 521 bytes |
| -rw-r--r-- | src/assets/images/tagg-tip.png | bin | 0 -> 233 bytes |
| -rw-r--r-- | src/assets/images/tagg-x-button.png | bin | 0 -> 549 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/src/assets/icons/tag-icon.png b/src/assets/icons/tag-icon.png Binary files differnew file mode 100644 index 00000000..9111b036 --- /dev/null +++ b/src/assets/icons/tag-icon.png diff --git a/src/assets/images/Tagg-Triangle.png b/src/assets/images/Tagg-Triangle.png Binary files differnew file mode 100644 index 00000000..dfe97282 --- /dev/null +++ b/src/assets/images/Tagg-Triangle.png diff --git a/src/assets/images/draggableX.png b/src/assets/images/draggableX.png Binary files differnew file mode 100644 index 00000000..b99c5dfc --- /dev/null +++ b/src/assets/images/draggableX.png diff --git a/src/assets/images/tagg-rectangle.png b/src/assets/images/tagg-rectangle.png Binary files differnew file mode 100644 index 00000000..24bfd67e --- /dev/null +++ b/src/assets/images/tagg-rectangle.png diff --git a/src/assets/images/tagg-tip.png b/src/assets/images/tagg-tip.png Binary files differnew file mode 100644 index 00000000..eb3c5bad --- /dev/null +++ b/src/assets/images/tagg-tip.png diff --git a/src/assets/images/tagg-x-button.png b/src/assets/images/tagg-x-button.png Binary files differnew file mode 100644 index 00000000..5ce3846d --- /dev/null +++ b/src/assets/images/tagg-x-button.png |
