Carla Iriberri d0f7ac4d49 Fix conflict

2016-02-10 20:00:48 +01:00

..

0.0.1

Geocoder server renamed to dataservices server extension

2016-02-05 17:57:22 +01:00

0.1.0

Geocoder server renamed to dataservices server extension

2016-02-05 17:57:22 +01:00

0.2.0

Removed legacy name for street function

2016-02-08 13:27:19 +01:00

0.3.0

Removed legacy name for street function

2016-02-08 13:27:19 +01:00

0.4.0

Fix conflict

2016-02-10 20:00:48 +01:00