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

..

Adding Points to a Map.md

[ios] Doc fixes for "Adding Points to a Map" guide

2017-11-09 13:11:09 -05:00

For Style Authors.md

Merge branch 'master' into release-boba

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

Gesture Recognizers.md

[ios, macos] Rename the iOS and macOS SDKs (#10610)

2017-12-04 16:40:14 -08:00

Info.plist Keys.md

[ios, macos] Updates documentation with default CJK font recommendations

2018-01-02 18:46:40 -05:00

Runtime Styling.md

[ios] Add next steps to Runtime Styling guide (#7855)

2017-03-20 22:34:15 -07:00

Tile URL Templates.md

Merge release-ios-v3.6.0-android-v5.1.0 to master (#9170)

2017-06-02 23:41:14 +02:00

Using Style Functions at Runtime.md

Reimplement style values atop NSExpression (#10726)

2018-01-24 00:04:02 -08:00

Working with Mapbox Studio.md

[ios] swapped link for circle layer example (#8818)

2017-04-26 09:25:07 -07:00