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

[rails.git] / config / banners.yml

diff --git a/config/banners.yml b/config/banners.yml
index 350ecbe4eea889e889e848168b56b473df5bd0fa..2d3f4dd6305c66a05f9ad7336e29ff7a4d2fc5c0 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -1,20 +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
-
-fossgis2016:
-  id: fossgis2016
-  alt: FOSSGIS conference 2016
-  link: http://www.fossgis-konferenz.de/2016/
-  img: banners/fossgis-2016.jpg
-  enddate: 2016-jul-04
+sotm2018:
+  id: sotm2018
+  alt: SotM 2018
+  link: https://2018.stateofthemap.org/
+  img: banners/sotm2018.png
+  enddate: 2018-jul-30
+saveyourinternet:
+  id: saveyourinternet
+  alt: "The EU Copyright Directive threatens free content on the Internet and OpenStreetMap. Demonstrations in various European cities on 23 March. https://savetheinternet.info/demos"
+  link: https://savetheinternet.info/demos
+  img: banners/saveyourinternet.png
+  enddate: 2019-mar-26