Jason Wray e67f0be813 Merge tag 'ios-v4.0.2' into master ...

Conflicts:
	mapbox-gl-js
	platform/android/CHANGELOG.md
	platform/android/gradle/dependencies.gradle
	platform/ios/CHANGELOG.md
	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
	platform/ios/Mapbox-iOS-SDK-symbols.podspec
	platform/ios/Mapbox-iOS-SDK.podspec
	platform/node/test/ignores.json
	src/mbgl/geometry/feature_index.cpp
	src/mbgl/geometry/feature_index.hpp
	src/mbgl/layout/symbol_layout.cpp

2018-05-30 13:01:04 -04:00

1.7 KiB

Raw Blame History

View Raw