Merge branch 'release-boba' into master

# Conflicts:
#	mapbox-gl-js
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/gradle/dependencies.gradle
#	platform/darwin/src/MGLVectorTileSource.mm
#	platform/darwin/src/MGLVectorTileSource_Private.h
#	platform/ios/CHANGELOG.md
#	src/mbgl/style/expression/compound_expression.cpp
This commit is contained in:
Fabian Guerra
2018-05-17 11:47:31 -04:00
143 changed files with 2541 additions and 1936 deletions

View File

@@ -1,6 +1,6 @@
Pod::Spec.new do |m|
version = '4.0.0'
version = '4.0.1'
m.name = 'Mapbox-iOS-SDK'
m.version = version