Fix conflicts take 4

This commit is contained in:
Carla Iriberri
2016-07-11 12:18:07 +02:00
42 changed files with 4774 additions and 55 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
# Data Services API
The CartoDB Data Services SQL API (server and client FTM)
# CARTO Data Services API
The CARTO Data Services SQL API
### Deploy instructions
Steps to deploy a new Data Services API version :