diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-06-24 17:41:45 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-06-24 17:41:45 -0400 |
| commit | b184179a8bff25ad018d02abc31acadc7b3f6a62 (patch) | |
| tree | efd94448ee76860156d7622a61e6eb8785c10f10 /ios | |
| parent | 981051448fee6197544383e535fea7a72827d41d (diff) | |
| parent | 53bdc94cf0491e348b7d4ad61e51ce1844423773 (diff) | |
Merge branch 'master' into tma948-video-playback
# Conflicts:
# ios/Podfile.lock
# package.json
# src/components/moments/Moment.tsx
# src/routes/main/MainStackNavigator.tsx
# src/screens/moments/TagFriendsScreen.tsx
# src/screens/profile/CaptionScreen.tsx
# yarn.lock
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/Podfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ios/Podfile b/ios/Podfile index 4eca4100..d8324a6d 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -33,4 +33,4 @@ end # add the Firebase pod for Google Analytics pod 'Firebase/Analytics' # add pods for any other desired Firebase products -# https://firebase.google.com/docs/ios/setup#available-pods
\ No newline at end of file +# https://firebase.google.com/docs/ios/setup#available-pods |