Skip to content

Commit c6be49f

Browse files
author
Shawn Dempsey
committed
Merge remote-tracking branch 'origin/master' into @jpiasecki/turbomodule
# Conflicts: # android/build.gradle # package.json # react-native.config.js # src/RCTAsyncStorage.ts # yarn.lock
2 parents 109011e + f804102 commit c6be49f

File tree

22 files changed

+12004
-8168
lines changed

22 files changed

+12004
-8168
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 298 deletions
This file was deleted.

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* text=auto
2+
*.pbxproj -text
3+
/.yarn/releases/* binary

‎.circleci/Brewfile.ios renamed to ‎.github/Brewfile.ios

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
tap 'wix/brew'
22
brew 'applesimutils'
3-
brew 'cocoapods'

0 commit comments

Comments
 (0)