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

diff --git a/app/assets/images/banners/foss4g-it2018-banner.png b/app/assets/images/banners/foss4g-it2018-banner.png
new file mode 100755 (executable)
index 0000000..c9d1f40
Binary files /dev/null and b/app/assets/images/banners/foss4g-it2018-banner.png differ

diff --git a/config/banners.yml b/config/banners.yml
index d0fc4df6876eb778ee04677397893ce54895d6d6..8cc7be5f09b961a0db58f1d91dc636171b242d66 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -4,3 +4,9 @@ fossgis2018:
   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