Merge branch 'master' into tma626-people-tutorial

# Conflicts:
#	src/screens/suggestedPeople/SuggestedPeopleScreen.tsx

1 files changed, 6 insertions, 8 deletions

diff --git a/ios/Podfile b/ios/Podfile
index 7de1c849..73187053 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -12,15 +12,13 @@ target 'Frontend' do
     # Pods for testing
   end
 
-  # Enables Flipper.
-  #
-  # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable these next few lines.
+  # An issue in flipper-folly podspec caused failure in building. 
+  # Using an older version of flipper folly for that purpose.
   # https://github.com/facebook/react-native/issues/30836
-  # use_flipper!
-  # post_install do |installer|
-  #   flipper_post_install(installer)
-  # end
+  use_flipper!({ 'Flipper-Folly' => '2.3.0' })
+  post_install do |installer|
+    flipper_post_install(installer)
+  end
 end
 
 target 'Frontend-tvOS' do