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 /ios | |
| parent | 2360e774d94e271d1d9db0d5b92b801b9325535e (diff) | |
| parent | b1dee65ee7bb8e120fc38a495f4027905d300650 (diff) | |
Merge branch 'master' into tma-634-badge-selection-screen
# Conflicts:
# src/components/taggs/SocialMediaInfo.tsx
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/120-1.png | bin | 12352 -> 13316 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/120.png | bin | 12352 -> 13316 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/180.png | bin | 19234 -> 22554 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/40.png | bin | 2417 -> 3272 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/58.png | bin | 3969 -> 5347 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/60.png | bin | 4186 -> 5618 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/80.png | bin | 8100 -> 8102 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/87.png | bin | 9487 -> 9008 bytes |
| -rw-r--r-- | ios/Frontend/Images.xcassets/AppIcon.appiconset/appstore.png | bin | 105704 -> 212236 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/120-1.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/120-1.png Binary files differindex 3c4ea26e..c28e2cb7 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/120-1.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/120-1.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/120.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/120.png Binary files differindex 1e399016..c28e2cb7 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/120.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/120.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/180.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/180.png Binary files differindex 039c9352..48ae0c80 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/180.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/180.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/40.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/40.png Binary files differindex deb7b94f..f129b763 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/40.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/40.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/58.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/58.png Binary files differindex b1526abe..8fb85f02 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/58.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/58.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/60.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/60.png Binary files differindex cfb29fe9..022b1c17 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/60.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/60.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/80.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/80.png Binary files differindex 86708166..866b421d 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/80.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/80.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/87.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/87.png Binary files differindex bc9b852b..afe863d0 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/87.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/87.png diff --git a/ios/Frontend/Images.xcassets/AppIcon.appiconset/appstore.png b/ios/Frontend/Images.xcassets/AppIcon.appiconset/appstore.png Binary files differindex 133c1517..fd942ff0 100644 --- a/ios/Frontend/Images.xcassets/AppIcon.appiconset/appstore.png +++ b/ios/Frontend/Images.xcassets/AppIcon.appiconset/appstore.png |
