Merge remote-tracking branch 'origin/master' into remove_schema_triggers

This commit is contained in:
Alejandro Martínez
2015-11-05 14:49:46 +01:00
14 changed files with 490 additions and 73 deletions
+5 -1
View File
@@ -1,7 +1,7 @@
# cartodb/Makefile
EXTENSION = cartodb
EXTVERSION = 0.11.0
EXTVERSION = 0.11.3
SED = sed
@@ -10,6 +10,7 @@ CDBSCRIPTS = \
scripts-available/CDB_SearchPath.sql \
scripts-available/CDB_ExtensionPost.sql \
scripts-available/CDB_ExtensionUtils.sql \
scripts-available/CDB_Helper.sql \
$(END)
UPGRADABLE = \
@@ -50,6 +51,9 @@ UPGRADABLE = \
0.10.1 \
0.10.2 \
0.11.0 \
0.11.1 \
0.11.2 \
0.11.3 \
$(EXTVERSION)dev \
$(EXTVERSION)next \
$(END)