Permalink
Browse files

Merge pull request #11 from kytrinyx/magic-cfp

Magic cfp
  • Loading branch information...
2 parents 564173b + 0c3220b commit c31c3691b6f2f17670b15536917c93632836f9b4 @janl committed Jun 23, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 _posts/2012-06-13-conferences-with-open-cfps.md
View
4 _posts/2012-06-13-conferences-with-open-cfps.md
@@ -59,7 +59,6 @@ JS.everywhere | san jose. 26 - 27 october 2012
##[Full Frontal](http://2012.full-frontal.org/)
-<<<<<<< HEAD
Apply [here](http://2012.full-frontal.org/#talk). Closing on 7th November.
full frontal | brighton. 9 november 2012
@@ -110,6 +109,9 @@ July 25th-July 27th in Seattle
<blockquote class="twitter-tweet"><p>@<a href="https://twitter.com/theophani">theophani</a> MozCon's accepting pitches <a href="http://t.co/pYG0yxpb" title="http://mz.cm/MCj6C1">mz.cm/MCj6C1</a> We have almost 50/50 gender ratio</p>&mdash; Erica McGillivray (@emcgillivray) <a href="https://twitter.com/emcgillivray/status/213131199193956352" data-datetime="2012-06-14T04:50:12+00:00">June 14, 2012</a></blockquote>
+##[MagicRuby](http://magic-ruby.com)
+
+magicruby | orlando, fl, usa | 5 - 6 october 2012
<!-- leave this script at the bottom please :) -->
<!-- TODO: put this somewhere else ... -->

0 comments on commit c31c369

Please sign in to comment.