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

[rails.git] / config / banners.yml

diff --git a/config/banners.yml b/config/banners.yml
index 040b40e18398b8f88ed2331d3c587b3ea6352279..8cc7be5f09b961a0db58f1d91dc636171b242d66 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,13 +1,12 @@
-sotmus2016:
-  id: sotmus2016
-  alt: State of the Map US 2016
-  link: http://stateofthemap.us/
-  img: banners/sotmus-2016.jpg
-  enddate: 2016-jul-23
-
-sotm2016:
-  id: sotm2016
-  alt: State of the Map 2016
-  link: http://2016.stateofthemap.org/
-  img: banners/sotm-2016.jpg
-  enddate: 2016-sep-23
+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