diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-05-29 15:57:41 +0100 |
| commit | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (patch) | |
| tree | 38b8570647124df06c637d4b923f6010211ef328 /web/i | |
| parent | 40b3a51d33caefa8f5fb97ce9be18ef936c7e260 (diff) | |
| parent | 131ff6e9bf3626d6a8fff6ae54669d250148a63a (diff) | |
Merge remote branch 'origin/master' into fmb-read-only
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
templates/web/fixmystreet/alert/index.html
templates/web/fixmystreet/around/display_location.html
web/cobrands/fixmystreet/_layout.scss
web/js/map-OpenLayers.js
Diffstat (limited to 'web/i')
| -rw-r--r-- | web/i/pin-green.png | bin | 1806 -> 1316 bytes |
| -rw-r--r-- | web/i/pin-red.png | bin | 1841 -> 1353 bytes |
| -rw-r--r-- | web/i/pin-yellow-big.png | bin | 2364 -> 1242 bytes |
| -rw-r--r-- | web/i/pin-yellow.png | bin | 1475 -> 828 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/web/i/pin-green.png b/web/i/pin-green.png Binary files differindex 8b64d5160..47a0a6cc1 100644 --- a/web/i/pin-green.png +++ b/web/i/pin-green.png diff --git a/web/i/pin-red.png b/web/i/pin-red.png Binary files differindex 9b754e42e..298f4d3f6 100644 --- a/web/i/pin-red.png +++ b/web/i/pin-red.png diff --git a/web/i/pin-yellow-big.png b/web/i/pin-yellow-big.png Binary files differindex 59ed29dbd..d1642d644 100644 --- a/web/i/pin-yellow-big.png +++ b/web/i/pin-yellow-big.png diff --git a/web/i/pin-yellow.png b/web/i/pin-yellow.png Binary files differindex f9359b0b3..196cb0f5f 100644 --- a/web/i/pin-yellow.png +++ b/web/i/pin-yellow.png |
