Rafa de la Torre 360b5bd57f Merge remote-tracking branch 'origin/development' into mapzen_services_use_quotas ...

Solve merge conflict in setup.py (version of python lib).

2016-12-20 18:14:01 +01:00

..

cartodb_services

Merge remote-tracking branch 'origin/development' into mapzen_services_use_quotas

2016-12-20 18:14:01 +01:00