Merge branch 'master' of github.com:neuf/studio11-theme

This commit is contained in:
sjurher committed 2011-07-31 17:36:58 +02:00
commit b8e32b4b2a
2 files changed
+198 -197

No files matched your search

+3 -2
View File
@@ -52,11 +52,12 @@
<?php endif; ?>
<div class="entry-utility">
<?php twentyten_posted_in(); ?>
<?php //twentyten_posted_in(); ?>
<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</div><!-- .entry-utility -->
<fb:comments href="<?php the_permalink() ?>" num_posts="2" width="500"></fb:comments>
<div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:comments href="<?php the_permalink() ?>" num_posts="2" width="500"></fb:comments>
</div><!-- #post-## -->
<?php /* <div id="nav-below" class="navigation">