Files
MapLibreParticleLab/platform
Jason Wray 8c00a41708 Merge tag 'ios-v3.7.8' into master
Conflicts:
	platform/android/CHANGELOG.md
	platform/android/MapboxGLAndroidSDK/gradle.properties
	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
	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/ios/ios.xcodeproj/project.pbxproj
	platform/ios/src/MGLAPIClient.m
2018-05-10 16:22:44 -04:00
..
2018-05-10 16:22:44 -04:00