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

[rails.git] / config / banners.yml

diff --git a/config/banners.yml b/config/banners.yml
index 2675651eb27eceb6b7b1fd78a1f4683cac7a2849..8cc7be5f09b961a0db58f1d91dc636171b242d66 100644 (file)
--- 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
 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