Raul Ochoa 3af2136770 Merge branch 'master' into standalone-server ... Conflicts: lib/cartodb/cartodb_windshaft.js lib/cartodb/monitoring/health_check.js		2015-09-04 13:21:54 +02:00
..
index.js	Splits controllers and supports after layergroup creation actions	2015-07-10 11:24:32 +02:00
layergroup.js	Remove console.log	2015-07-15 16:10:59 +02:00
map.js	Use named map provider cache to retrieve providers	2015-07-14 20:53:06 +02:00
named_maps_admin.js	More strict jshint	2015-07-15 15:03:28 +02:00
named_maps.js	Fallback to image/png header	2015-07-31 12:23:36 +02:00
server_info.js	Merge branch 'master' into standalone-server	2015-09-04 13:21:54 +02:00