Skip to content

Commit

Permalink
Merge branch 'master' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Nov 14, 2013
2 parents 5fdaf85 + 211bc74 commit eb95efb
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions resources/home.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$title = "Returning in 2013 - ";
$title = "On Hiatus - ";
ob_start();
?>
<div id="container" class="home">
Expand All @@ -8,23 +8,22 @@
<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.phpcon.org%2F&amp;layout=button_count&amp;show_faces=false&amp;width=80&amp;action=like&amp;colorscheme=light&amp;height=21" style="border:none; overflow:hidden; width:80px; height:21px;" id="fbLike"></iframe>
<p class="twitter">Follow Us: <a href="http://twitter.com/phpcomcon">PHPCOMCON</a></p>
</div>
<h1>PHP Community
<span>Conference</span></h1>
<h2>2013 &ndash; TBA</h2>
<h1>PHP Community <span>Conference</span></h1>
<h2>on hiatus</h2>
<h3>Nashville,<span>&nbsp;</span>TN</h3>
</div>
<div class="aside">
<p>A conference for people who care about PHP and what they make with it.</p>
</div>
<div class="section" id="main">
<h4>The PHP Community Conference Returns in 2013!</h4>
<h4>The PHP Community Conference on Hiatus!</h4>
<p>In 2011, we had our first ever conference. Our sponsors,
speakers, and attendees were phenomenal. You rocked so much that
we want to do it again!</p>
<p>In 2013, this friendly little PHP conference is returning to
Nashville, TN! We're still nailing down the details and dates, so keep
your eyes on this space and <a href="http://twitter.com/phpcomcon">follow
us on Twitter</a> for more details over the coming weeks and months.</p>
speakers, and attendees were phenomenal. You rocked so much!</p>
<p>Unfortunately, due to reasons, we are on hiatus. In the meantime,
there are tons of other community-run PHP conferences out there.
If you don't believe us, just check out
<a href="http://php.net/conferences/">php.net/conferences</a></p>
<p>We hope to see you at a local PHP conference soon!</p>
<p>We've archived our <a href="/2011">2011 conference web site</a>
for your convenience.</p>
</div>
Expand Down

0 comments on commit eb95efb

Please sign in to comment.