"basice2e/git@git.xx.network:elixxir/integration.git" did not exist on "3d68729da1960e0b22798f7bf5baca5419b407a0"

build-bindings.sh

2 years ago

Merge branch 'development' into dev/macos-support-2 · b4639b36

Dariusz Rybicki authored 2 years ago

# Conflicts:
#	Frameworks/Bindings.xcframework/Info.plist
#	Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings
#	Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings

b4639b36

History

Merge branch 'development' into dev/macos-support-2

Dariusz Rybicki authored 2 years ago

# Conflicts:
#	Frameworks/Bindings.xcframework/Info.plist
#	Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings
#	Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings