scala · heathermiller · Sep 16, 2016 · Sep 16, 2016 · Sep 16, 2016
diff --git a/events/_posts/2016-09-03-scalawave.md → events/_posts/2016-11-25-scalawave.md b/events/_posts/2016-09-03-scalawave.md → events/_posts/2016-11-25-scalawave.md
diff --git a/events/_posts/2017-05-03-flatmap-oslo.md b/events/_posts/2017-05-03-flatmap-oslo.md
@@ -0,0 +1,10 @@
+---
+category: event
+title: flatMap(Oslo)
+logo: /resources/img/flatmap-oslo-17.png
+location: Oslo
+description: "flatMap(Oslo) is a functional programming conference with focus on Scala and the Java Virtual Machine"
+start: 2 May 2017
+end: 3 May 2017
+link-out: http://2017.flatmap.no/
+---
diff --git a/resources/img/flatmap-oslo-17.png b/resources/img/flatmap-oslo-17.png
diff --git a/resources/img/flatmap-oslo-17@2x.png b/resources/img/flatmap-oslo-17@2x.png