diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-09 18:29:42 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-09 18:29:42 -0400 |
| commit | 875812fd5674cf183d094f569de4e2a0d1de6693 (patch) | |
| tree | 29cfc6a258561e884f8a823d0226a81cd6120e2c /src/assets | |
| parent | 6527289eb6249cfd057c47d0f797133ab8052339 (diff) | |
| parent | a6580f418e87775a5e683e56735952df4f7fa5a9 (diff) | |
Merge branch 'master' into tma767-message-button
# Conflicts:
# src/screens/chat/ChatListScreen.tsx
Diffstat (limited to 'src/assets')
| -rw-r--r-- | src/assets/badges/brown/iff.png | bin | 0 -> 8364 bytes |
| -rw-r--r-- | src/assets/badges/brown/sailing.png | bin | 0 -> 17152 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/assets/badges/brown/iff.png b/src/assets/badges/brown/iff.png Binary files differnew file mode 100644 index 00000000..02f9a1c8 --- /dev/null +++ b/src/assets/badges/brown/iff.png diff --git a/src/assets/badges/brown/sailing.png b/src/assets/badges/brown/sailing.png Binary files differnew file mode 100644 index 00000000..1fde1c39 --- /dev/null +++ b/src/assets/badges/brown/sailing.png |
