Merge branch 'master' into update-turbocarto

This commit is contained in:
Raul Ochoa 2016-12-12 18:51:04 +01:00
commit 8f5e1de6d8

View File

@ -1,9 +1,9 @@
dist: trusty # only environment that supports Postgres 9.5 at this time dist: trusty
sudo: required
addons: addons:
postgresql: "9.5" postgresql: "9.5"
apt: apt:
packages: packages:
- postgresql-9.5-postgis-2.3
- postgresql-plpython-9.5 - postgresql-plpython-9.5
- pkg-config - pkg-config
- libcairo2-dev - libcairo2-dev
@ -22,9 +22,3 @@ env:
language: node_js language: node_js
node_js: node_js:
- "0.10" - "0.10"
notifications:
irc:
channels:
- "irc.freenode.org#cartodb"
use_notice: true