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

2015-12-23 17:09:41 +01:00
parent 2a8d467949 a9f6e26fed
commit 2a2a7d534a
13 changed files with 215 additions and 41 deletions
@@ -6,7 +6,7 @@ cartodb-postgresql

 PostgreSQL extension for CartoDB

-See https://github.com/CartoDB/cartodb/wiki/CartoDB-PostgreSQL-extension
+See [the cartodb-postgresql wiki](https://github.com/CartoDB/cartodb-postgresql/wiki).

 Dependencies
 ------------