From ba8648919e9f92258fa6830ad1c981677f19213c Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Fri, 23 Mar 2018 16:52:09 -0400
Subject: [PATCH] Add DockerCon conference

---
 conferences/2018/devops.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conferences/2018/devops.json b/conferences/2018/devops.json
index 4acbc389..3e1d3694 100644
--- a/conferences/2018/devops.json
+++ b/conferences/2018/devops.json
@@ -377,5 +377,14 @@
     "twitter": "@devopsdayssthlm",
     "cfpUrl": "https://www.devopsdays.org/events/2018-stockholm/propose",
     "cfpEndDate": "2018-04-02"
+  },
+  {
+    "name": "DockerCon",
+    "url": "https://2018.dockercon.com",
+    "startDate": "2018-06-12",
+    "endDate": "2018-06-15",
+    "city": "San Fransisco",
+    "country": "U.S.A.",
+    "twitter": "@DockerCon"
   }
 ]