Fabian Guerra
903e7989ec
Merge branch 'master' into release-boba
# Conflicts:
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
# platform/android/scripts/exclude-activity-gen.json
# 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/macos/CHANGELOG.md
2018-02-15 11:54:51 -05:00
..
2017-01-04 23:06:22 +01:00
2018-02-15 11:54:51 -05:00
2017-04-27 15:56:55 -07:00
2018-02-15 17:38:23 +02:00
2018-01-24 08:35:31 -08:00