Merge branch 'master' of github.com:CartoDB/CartoDB-SQL-API

This commit is contained in:
Daniel García Aubert 2016-01-28 16:33:10 +01:00
commit e1e6a56277
3 changed files with 6 additions and 2 deletions

View File

@ -1,3 +1,7 @@
1.25.2 - 2016-mm-dd
-------------------
1.25.1 - 2016-01-28 1.25.1 - 2016-01-28
------------------- -------------------

2
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "cartodb_sql_api", "name": "cartodb_sql_api",
"version": "1.25.1", "version": "1.25.2",
"dependencies": { "dependencies": {
"cartodb-psql": { "cartodb-psql": {
"version": "0.6.1", "version": "0.6.1",

View File

@ -5,7 +5,7 @@
"keywords": [ "keywords": [
"cartodb" "cartodb"
], ],
"version": "1.25.1", "version": "1.25.2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git" "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"