diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-02-21 12:31:17 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-02-21 12:31:17 +0000 |
| commit | e2bf144a6aaa19779fc55a04081a3c269b9d0f81 (patch) | |
| tree | 00318d801d35948938743608252fccd2d1b4e585 /web/i | |
| parent | eb0c0d42f3596c5dc21e9bcdcc02a4008a541c34 (diff) | |
| parent | f8a8948ddb790e7e7593d538c55a3a278fbf3973 (diff) | |
Merge remote branch 'origin/zurich'
(locale ignored, will rerun .po extraction after to get all changes.)
Conflicts:
locale/FixMyStreet.po
locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
templates/web/fixmystreet/report/banner.html
templates/web/zurich/faq/faq-de-ch.html
Diffstat (limited to 'web/i')
| -rw-r--r-- | web/i/pin-green-big.png | bin | 0 -> 3270 bytes |
| -rw-r--r-- | web/i/pin-red-big.png | bin | 0 -> 3401 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/web/i/pin-green-big.png b/web/i/pin-green-big.png Binary files differnew file mode 100644 index 000000000..16d73230a --- /dev/null +++ b/web/i/pin-green-big.png diff --git a/web/i/pin-red-big.png b/web/i/pin-red-big.png Binary files differnew file mode 100644 index 000000000..2d970b9e2 --- /dev/null +++ b/web/i/pin-red-big.png |
