diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-09 19:55:26 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-09 19:55:26 -0400 |
| commit | 0a480048b41a80e8569ce57064d1b9716c3d25e3 (patch) | |
| tree | 4f1118560c10dcdfa32e99d2b73c3d7814d7904d /src/assets | |
| parent | 17de7d8312b10f84af2178f769ff92bf96ab47f5 (diff) | |
| parent | 9d5ad9bea36c0b2abffd04b25126d18158017137 (diff) | |
Merge branch 'master' into tma784-style-message-input
# Conflicts:
# src/screens/chat/ChatListScreen.tsx
# src/screens/chat/ChatScreen.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 |
