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

..

src

Merge branch 'master' into release-boba

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

build.gradle

[android] - remove lost dependency from the sdk

2018-02-13 13:41:24 +01:00

gradle.properties

[android] - update SNAPSHOT version to v5.4.2

2018-02-12 11:14:39 +01:00

lint.xml

[android] Move into platform subdirectory

2015-12-16 14:52:29 -08:00

proguard-rules.pro

[android] - remove lost dependency from the sdk

2018-02-13 13:41:24 +01:00