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

[rails.git] / config / banners.yml

diff --git a/config/banners.yml b/config/banners.yml
index 3b151afba025abaf4db23dbcb682921dbdb11a63..8cc7be5f09b961a0db58f1d91dc636171b242d66 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,20 +1,12 @@
-sotmasia2016:
-  id: sotmasia2016
-  alt: State of the Map Asia 2016
-  link: http://stateofthemap.asia/
-  img: banners/sotmasia-2016.jpg
-  enddate: 2016-oct-01
-
-donate2016:
-  id: donate2016
-  alt: OpenStreetMap Funding Drive 2016
-  link: https://donate.openstreetmap.org/
-  img: banners/donate-2016.jpg
-  enddate: 2016-oct-31
-
-sotmlatam2016:
-  id: sotmlatam2016
-  alt: State of the Map Latam 2016
-  link: http://state.osmlatam.org/
-  img: banners/sotmlatam-2016.jpg
-  enddate: 2016-nov-25
+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