Merge remote-tracking branch 'origin/master' into mvt-path-conf

2017-10-10 17:53:28 +02:00
parent b18bf967fd 893fac31a7
commit d30f710534
49 changed files with 903 additions and 687 deletions
@@ -7,7 +7,7 @@ var serverOptions = require('../../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions);
 var TestClient = require('../../support/test-client');

-var LayergroupToken = require('../../support/layergroup-token');
+var LayergroupToken = require('../../../lib/cartodb/models/layergroup-token');

 describe('named-maps analysis', function() {