Merge remote-tracking branch 'upstream/master'

iqbalmalik89 · iqbalmalik89 · commit 3c618a0dc4f6 · 2015-04-12T22:47:37.000+05:00
diff --git a/_posts/17-03-01-Conferences.md b/_posts/17-03-01-Conferences.md
@@ -5,5 +5,8 @@ anchor:  conferences
 
 ## Conferences {#conferences_title}
 
+* [http://laracon.us][us-url]
+* [http://laracon.eu][eu-url]
+
 [us-url]:http://laracon.us/
 [eu-url]:http://laracon.eu/
