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

..

exclude-activity-gen.json

Merge branch 'master' into release-boba

2018-02-15 11:54:51 -05:00

generate-style-code.js

[core, ios, macos, android, node] Heatmap layer (#11046)

2018-02-15 17:38:23 +02:00

generate-test-code.js

[android] - add config file for excluding generated tests, refactor generation script output

2017-11-08 09:58:31 +01:00

metrics.sh

[android] move build to Android Studio

2017-03-17 14:25:37 +01:00

release.py

[android] Update release script to support CircleCI builds (#8950)

2017-05-11 09:19:24 -04:00