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

[rails.git] / config / banners.yml

diff --git a/config/banners.yml b/config/banners.yml
index f8a3200537c8f70be39930eac5f4ca24774ba0ed..8cc7be5f09b961a0db58f1d91dc636171b242d66 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,12 +1,12 @@
-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
+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