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

This commit is contained in:
Alejandro Martínez
2015-12-23 17:09:41 +01:00
13 changed files with 215 additions and 41 deletions
+3 -1
View File
@@ -1,7 +1,7 @@
# cartodb/Makefile
EXTENSION = cartodb
EXTVERSION = 0.11.3
EXTVERSION = 0.11.5
SED = sed
@@ -54,6 +54,8 @@ UPGRADABLE = \
0.11.1 \
0.11.2 \
0.11.3 \
0.11.4 \
0.11.5 \
$(EXTVERSION)dev \
$(EXTVERSION)next \
$(END)