From 9a21e0f50b8984e739a6a8f859c3d0ef0625687a Mon Sep 17 00:00:00 2001
From: Naomi Black <naomitraveller@gmail.com>
Date: Mon, 1 Feb 2016 12:25:41 -0800
Subject: [PATCH] events(devintersection): Add devintersection europe and
 routing for events

---
 firebase.json      |  4 ++++
 public/events.jade | 57 ++++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/firebase.json b/firebase.json
index 3ce9d65cf7..7a3251612b 100644
--- a/firebase.json
+++ b/firebase.json
@@ -45,6 +45,10 @@
     {
       "source": "/license",
       "destination": "/license.txt"
+    },
+    {
+      "source": "/events",
+      "destination": "/events.html"
     }
   ],
   "ignore": [
diff --git a/public/events.jade b/public/events.jade
index 0cc46d5d00..3714c03cca 100644
--- a/public/events.jade
+++ b/public/events.jade
@@ -15,22 +15,6 @@
     .c10.text-center
         hr
 
-<!-- AngularJS Days -->
-.grid-fluid
-    .c2.text-left
-        h4 Feb. 21-23, 2016
-    .c4.text-left
-        h4 Munich, Germany
-    .c4.text-left
-        h4
-          a(
-          target="_blank"
-          href="http://angularjs-days.de/"
-          ) AngularJS Days
-.grid-fluid
-    .c10.text-center
-        hr
-
 <!-- O'Reilly Fluent -->
 .grid-fluid
     .c2.text-left
@@ -47,10 +31,26 @@
     .c10.text-center
         hr
 
+<!-- AngularJS Days -->
+.grid-fluid
+    .c2.text-left
+        h4 Mar. 21-23, 2016
+    .c4.text-left
+        h4 Munich, Germany
+    .c4.text-left
+        h4
+            a(
+            target="_blank"
+            href="http://angularjs-days.de/"
+            ) AngularJS Days
+.grid-fluid
+    .c10.text-center
+        hr
+
 <!-- ng-conf -->
 .grid-fluid
     .c2.text-left
-        h4 May 5-6, 2016
+        h4 May 4-6, 2016
     .c4.text-left
         h4 Salt Lake City, NV, USA
     .c4.text-left
@@ -73,7 +73,7 @@
             a(
             target="_blank"
             href="http://angularconnect.com/"
-            ) ng-conf
+            ) Angular Connect
 .grid-fluid
     .c10.text-center
         hr
@@ -88,5 +88,22 @@
         h4
             a(
             target="_blank"
-            href="https://ng-europe.org/"
-            ) ngconf
+            href="https://ngeurope.org/"
+            ) ng-europe
+.grid-fluid
+    .c10.text-center
+        hr
+
+<!-- DEVIntersection -->
+.grid-fluid
+    .c2.text-left
+        h4 Nov 14-16, 2016
+    .c4.text-left
+        h4 Amsterdam, Netherlands
+    .c4.text-left
+        h4
+            a(
+            target="_blank"
+            href="https://www.devintersectioneurope.com/"
+            ) DEVintersection Europe
+