尹诚 / Mapbox-iOS-SDK · Commits

Conflicts resolved:
	MapView/Map/RMGreatCircleAnnotation.h
	Mapbox.podspec

…llout view as it offers.

Merge commit 'adf08cbe' into develop

per https://github.com/incanus/great-circles this works fine; merging

Bugfix: RMMapTiledLayerView

fix GRMustache pinning in podspec

GRMustache was not updated, but the submodule was.

GRMustache was not updated, but the submodule was.