Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickebates committed Feb 3, 2014
2 parents b73d9a8 + b2f00b1 commit 35959a5
Show file tree
Hide file tree
Showing 51 changed files with 683 additions and 262 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Project Nami
===============

###Version: `0.9.10`###
###Version: `0.9.11`###

###Description:###

Expand Down
8 changes: 8 additions & 0 deletions wp-admin/about.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@
</a>
</h2>

<div class="changelog point-releases">
<h3><?php echo _n( 'Maintenance Release', 'Maintenance Releases', 1 ); ?></h3>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.', 31 ), '3.8.1', number_format_i18n( 31 ) ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.8.1' ); ?>
</p>
</div>

<div class="changelog">
<h2 class="about-headline-callout"><?php _e( 'Introducing a modern new&nbsp;design' ); ?></h2>
<img class="about-overview-img" src="<?php echo is_ssl() ? 'https://' : '//s.'; ?>wordpress.org/images/core/3.8/overview.png?1" />
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/install-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ body.rtl,
display: block;
max-width: none;
box-sizing: border-box;
-mox-box-sizing: border-box;
-moz-box-sizing: border-box;
}

}
2 changes: 1 addition & 1 deletion wp-admin/css/install-rtl.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wp-admin/css/install.css
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ body.rtl,
display: block;
max-width: none;
box-sizing: border-box;
-mox-box-sizing: border-box;
-moz-box-sizing: border-box;
}

}
2 changes: 1 addition & 1 deletion wp-admin/css/install.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 35959a5

Please sign in to comment.