Raul Ochoa f96c80d7a1 Merge branch 'master' into standalone-server ...

Conflicts:
	lib/cartodb/cartodb_windshaft.js

2015-09-08 15:42:30 +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-08 15:42:30 +02:00