Carla Iriberri 6d7156e309 Fixing conflicts

2015-11-17 12:35:07 +01:00

..

00_installation_test.out

cartodb as dependency and use its config table #37

2015-11-17 12:01:18 +01:00

10_admin0_test.out

Fixing adm0 plural naming and cdb typos in NOTICE messages

2015-11-17 11:30:25 +01:00

20_admin1_test.out

Fixing adm0 plural naming and cdb typos in NOTICE messages

2015-11-17 11:30:25 +01:00

30_namedplaces_test.out

Fixing adm0 plural naming and cdb typos in NOTICE messages

2015-11-17 11:30:25 +01:00

40_postalcodes_test.out

Fixes IP address function naming and another CBD typo in postal codes

2015-11-17 12:26:18 +01:00

50_ipaddresses_test.out

Fixes IP address function naming and another CBD typo in postal codes

2015-11-17 12:26:18 +01:00

90_permissions_test.out

Fixing conflicts

2015-11-17 12:35:07 +01:00