Raul Ochoa 6bd967e9fb Merge branch 'master' into medusa-improvements ...

Conflicts:
	lib/cartodb/server_options.js

2015-02-06 12:01:28 +01:00

..

Map-API-internal.md

Fixed typos, etc.

2014-12-17 15:31:18 -05:00

Map-API.md

Added layer source info for cartodb.js

2015-02-04 16:23:34 -05:00

MapConfig-NamedMaps-extension.md

Add limitations for named maps of the user account

2015-01-30 11:27:16 +01:00

metrics.md

Update documentation to remove references to signed maps

2015-01-23 11:33:58 +01:00

MultiLayer-API.md

Fix url for stats wiki

2014-11-25 14:39:18 +01:00

Template-maps.md

Update documentation to remove references to signed maps

2015-01-23 11:33:58 +01:00