Fabian Guerra
6d1fdf2ca3
Merge branch 'release-ios-v3.6.0-android-v5.1.0' into master.
# Conflicts:
# circle.yml
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/dependencies.gradle
# platform/default/mbgl/storage/offline_database.cpp
# 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/app/Main.storyboard
# platform/ios/src/MGLMapView.mm
# src/mbgl/programs/attributes.hpp
# src/mbgl/renderer/painter_fill.cpp
# src/mbgl/tile/geometry_tile.hpp
# src/mbgl/tile/geometry_tile_worker.cpp
# src/mbgl/tile/raster_tile.cpp
# src/mbgl/tile/raster_tile.hpp
# src/mbgl/tile/raster_tile_worker.cpp
# test/tile/annotation_tile.test.cpp
# test/tile/geojson_tile.test.cpp
# test/tile/raster_tile.test.cpp
# test/tile/vector_tile.test.cpp
2017-09-27 12:08:24 -04:00
..
2017-07-28 19:36:13 +02:00
2017-09-27 12:08:24 -04:00
2017-07-21 14:03:37 +02:00
2017-08-28 15:18:20 -04:00
2017-06-02 23:41:14 +02:00
2017-01-27 11:44:16 +01:00
2017-01-27 11:44:16 +01:00
2017-05-11 12:06:11 +02:00
2017-09-26 16:22:25 +02:00
2017-07-28 19:36:13 +02:00
2015-12-16 14:52:29 -08:00
2017-09-14 07:44:35 +02:00