diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-28 18:02:52 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-28 18:02:52 +0100 |
| commit | 3773cf3459d023ed3515afbd4ff7b3e1253dc4d0 (patch) | |
| tree | ab4d4f6e1b99b93f9b916b64a99aa198e2ece20b /perllib/FixMyStreet/Map/FMS.pm | |
| parent | e2414d30dd673ecea38e2a40d187b835bd076ac3 (diff) | |
| parent | 70cbebec7bb2fd412c6a9fbfb694357401916372 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Report/Update.pm
templates/web/default/report/display.html
Diffstat (limited to 'perllib/FixMyStreet/Map/FMS.pm')
| -rw-r--r-- | perllib/FixMyStreet/Map/FMS.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm index a5a2dd9f0..c54ee8f3b 100644 --- a/perllib/FixMyStreet/Map/FMS.pm +++ b/perllib/FixMyStreet/Map/FMS.pm @@ -21,7 +21,7 @@ sub map_template { } sub copyright { - return _('Map contains Ordnance Survey data © Crown copyright and database right 2010. Microsoft'); + return _('Map contains Ordnance Survey data © Crown copyright and database right 2010.<br>© 2011 <a href="http://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey.'); } sub get_quadkey { |