diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-05 16:38:32 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-05 16:38:32 -0500 |
| commit | 1465df9621fb963ff873485ad927ff79ea547fa0 (patch) | |
| tree | affcb43f37f263f3e0e555dd019dd952b62e1f0a /src/assets | |
| parent | 2360e774d94e271d1d9db0d5b92b801b9325535e (diff) | |
| parent | b1dee65ee7bb8e120fc38a495f4027905d300650 (diff) | |
Merge branch 'master' into tma-634-badge-selection-screen
# Conflicts:
# src/components/taggs/SocialMediaInfo.tsx
Diffstat (limited to 'src/assets')
| -rw-r--r-- | src/assets/icons/purple-plus.png | bin | 0 -> 18370 bytes |
| -rw-r--r-- | src/assets/images/bwbadges.png | bin | 0 -> 528 bytes |
| -rw-r--r-- | src/assets/images/bwbadges@2x.png | bin | 0 -> 991 bytes |
| -rw-r--r-- | src/assets/images/bwbadges@3x.png | bin | 0 -> 1438 bytes |
| -rw-r--r-- | src/assets/images/search.png | bin | 0 -> 354 bytes |
| -rw-r--r-- | src/assets/images/search@2x.png | bin | 0 -> 643 bytes |
| -rw-r--r-- | src/assets/images/search@3x.png | bin | 0 -> 901 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/src/assets/icons/purple-plus.png b/src/assets/icons/purple-plus.png Binary files differnew file mode 100644 index 00000000..8b2ce903 --- /dev/null +++ b/src/assets/icons/purple-plus.png diff --git a/src/assets/images/bwbadges.png b/src/assets/images/bwbadges.png Binary files differnew file mode 100644 index 00000000..3a337775 --- /dev/null +++ b/src/assets/images/bwbadges.png diff --git a/src/assets/images/bwbadges@2x.png b/src/assets/images/bwbadges@2x.png Binary files differnew file mode 100644 index 00000000..60c2f995 --- /dev/null +++ b/src/assets/images/bwbadges@2x.png diff --git a/src/assets/images/bwbadges@3x.png b/src/assets/images/bwbadges@3x.png Binary files differnew file mode 100644 index 00000000..874c0c4d --- /dev/null +++ b/src/assets/images/bwbadges@3x.png diff --git a/src/assets/images/search.png b/src/assets/images/search.png Binary files differnew file mode 100644 index 00000000..ba9906ba --- /dev/null +++ b/src/assets/images/search.png diff --git a/src/assets/images/search@2x.png b/src/assets/images/search@2x.png Binary files differnew file mode 100644 index 00000000..fa133ae1 --- /dev/null +++ b/src/assets/images/search@2x.png diff --git a/src/assets/images/search@3x.png b/src/assets/images/search@3x.png Binary files differnew file mode 100644 index 00000000..3ea4ce15 --- /dev/null +++ b/src/assets/images/search@3x.png |
