From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Jan 2018 14:23:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1721'
X-Git-Tag: live~3207
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9abcdb68862d237bc71e4d74448d69d6275159cd?hp=738e1e9cc60d3d5987acdaf851466961d0f9d437

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

diff --git a/app/assets/images/banners/banner-sotmus2017.png b/app/assets/images/banners/banner-sotmus2017.png
deleted file mode 100644
index 25382bf4a..000000000
Binary files a/app/assets/images/banners/banner-sotmus2017.png and /dev/null differ
diff --git a/app/assets/images/banners/fossgis2018.png b/app/assets/images/banners/fossgis2018.png
new file mode 100644
index 000000000..619daa159
Binary files /dev/null and b/app/assets/images/banners/fossgis2018.png differ
diff --git a/app/assets/images/banners/osmf-membership-drive-2017.png b/app/assets/images/banners/osmf-membership-drive-2017.png
deleted file mode 100644
index 0b62b2168..000000000
Binary files a/app/assets/images/banners/osmf-membership-drive-2017.png and /dev/null differ
diff --git a/app/assets/images/banners/sotmasia-2017-banner.png b/app/assets/images/banners/sotmasia-2017-banner.png
deleted file mode 100644
index f18f5bf72..000000000
Binary files a/app/assets/images/banners/sotmasia-2017-banner.png and /dev/null differ
diff --git a/config/banners.yml b/config/banners.yml
index 2675651eb..8cc7be5f0 100644
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,24 +1,12 @@
+fossgis2018:
+  id: fossgis2018
+  alt: FOSSGIS Conference 2018
+  link: https://fossgis-konferenz.de/2018/
+  img: banners/fossgis2018.png
+  enddate: 2018-mar-24
 osmit2018:
   id: osmit2018
   alt: FOSS4G-IT 2018
   link: http://foss4g-it2018.gfoss.it/
   img: banners/foss4g-it2018-banner.png
   enddate: 2018-feb-22
-sotmasia2017:
-  id: sotmasia2017
-  alt: State of the Map Asia 2017
-  link: http://stateofthemap.asia/
-  img: banners/sotmasia-2017-banner.png
-  enddate: 2017-sep-25
-sotmus2017:
-  id: sotmus2017
-  alt: State of the Map US 2017
-  link: https://2017.stateofthemap.us/
-  img: banners/banner-sotmus2017.png
-  enddate: 2017-oct-20
-osmfmembership2017:
-  id: osmfmembership2017
-  alt: Join the OpenStreetMap Foundation
-  link: https://blog.openstreetmap.org/2017/09/25/join-the-openstreetmap-foundation-now-and-help-shape-the-future-of-the-project/
-  img: banners/osmf-membership-drive-2017.png
-  enddate: 2017-nov-11