gribse/achille-press
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/davidakennedy/_s into titles

Browse source 
Conflicts:
	image.php
	inc/custom-header.php
	searchform.php
This commit is contained in:
obenland 2013-09-25 14:59:11 -07:00
commit 543cae8bbf
7 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
footer.php
View file

@ -13,7 +13,7 @@
<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">
<?php do_action( '_s_credits' ); ?>
<a href="http://wordpress.org/" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', '_s' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', '_s' ), 'WordPress' ); ?></a>
<a href="http://wordpress.org/" rel="generator"><?php printf( __( 'Proudly powered by %s', '_s' ), 'WordPress' ); ?></a>
<span class="sep"> | </span>
<?php printf( __( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
</div><!-- .site-info -->