Raul Ochoa 6bd967e9fb Merge branch 'master' into medusa-improvements ... Conflicts: lib/cartodb/server_options.js		2015-02-06 12:01:28 +01:00
..
acceptance	Merge branch 'master' into medusa-improvements	2015-02-06 12:01:28 +01:00
fixtures	Add missing fixtures (thanks Fabio)	2013-04-12 14:34:45 +02:00
integration	Datasource to give per-layer authentication in named layers	2015-02-04 11:30:36 +01:00
monkey	windshaft for cartodb	2011-09-05 00:00:41 +01:00
support	Merge branch 'master' into 239-mapconfig-named-maps-extension	2015-02-04 18:59:07 +01:00
unit/cartodb	Accept 'open' string in templated auth as authorized	2015-01-28 17:29:50 +01:00
benchmark.js	Make benchmarker executable	2012-07-25 18:29:43 +02:00