From: Tom Hughes <tom@compton.nu>
Date: Wed, 24 Jan 2018 14:23:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1721'
X-Git-Tag: live~4290
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9abcdb68862d237bc71e4d74448d69d6275159cd?hp=a02ab17727123f15b95abb6cd524fdb5796509c1

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
index 000000000..c9d1f40c1
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 d0fc4df68..8cc7be5f0 100644
--- 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