diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-12 17:39:04 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-12 17:39:04 -0500 |
| commit | 40a0e9fde2a4a16baebb99f0285fc630ae6cfac1 (patch) | |
| tree | 34c352779a75ce907062b1c6cdabae73d05c670a /src/assets | |
| parent | 1433c44fd4588b9044df83e199a57223b4979446 (diff) | |
| parent | 34d94e1dff831aafa984a2f6c9b9b01e2e349154 (diff) | |
Merge branch 'master' into tma694-edit-badges
# Conflicts:
# src/components/search/SearchCategories.tsx
Diffstat (limited to 'src/assets')
| -rw-r--r-- | src/assets/images/shuffle-1.png | bin | 0 -> 157612 bytes |
| -rw-r--r-- | src/assets/images/shuffle-2.png | bin | 0 -> 149495 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/assets/images/shuffle-1.png b/src/assets/images/shuffle-1.png Binary files differnew file mode 100644 index 00000000..d28ddc21 --- /dev/null +++ b/src/assets/images/shuffle-1.png diff --git a/src/assets/images/shuffle-2.png b/src/assets/images/shuffle-2.png Binary files differnew file mode 100644 index 00000000..a6a701b0 --- /dev/null +++ b/src/assets/images/shuffle-2.png |
