Merge remote-tracking branch 'upstream/pull/2752'

diff --git a/app/assets/images/banners/osm_16_birthday.png b/app/assets/images/banners/osm_16_birthday.png
new file mode 100644 (file)
index 0000000..39e1fb9
Binary files /dev/null and b/app/assets/images/banners/osm_16_birthday.png differ

diff --git a/app/assets/images/banners/sotm_2020.png b/app/assets/images/banners/sotm_2020.png
deleted file mode 100644 (file)
index 7ef917d..0000000
Binary files a/app/assets/images/banners/sotm_2020.png and /dev/null differ

diff --git a/config/banners.yml b/config/banners.yml
index 73347834e7763985044df0979d7adee030566d6b..3a682ec79c5ffb024b86ba4d04ce54d23770a256 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,6 +1,6 @@
 sotm_2020:
-  id: sotm_2020
-  alt: State of the Map 2020
-  link: https://2020.stateofthemap.org/
-  img: banners/sotm_2020.png
-  enddate: 2020-jul-05
+  id: osm16birthday
+  alt: OpenStreetMap 16th Birthday
+  link: https://blog.openstreetmap.org/2020/08/01/celebrate-the-16th-osm-anniversary/
+  img: banners/osm_16_birthday.png
+  enddate: 2020-aug-15