Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
pippinsplugins committed Aug 8, 2014
2 parents 8f31c2b + 889fc31 commit 29090d0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion includes/country-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ function edd_get_country_list() {
'MG' => 'Madagascar',
'MW' => 'Malawi',
'MY' => 'Malaysia',
'Mv' => 'Maldives',
'MV' => 'Maldives',
'ML' => 'Mali',
'MT' => 'Malta',
'MH' => 'Marshall Islands',
Expand Down
2 changes: 1 addition & 1 deletion templates/checkout_cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<tr class="edd_cart_footer_row edd_cart_subtotal_row"<?php if ( ! edd_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
<?php do_action( 'edd_checkout_table_subtotal_first' ); ?>
<th colspan="<?php echo edd_checkout_cart_columns(); ?>" class="edd_cart_subtotal">
<?php _e( 'Subtotal', 'edd' ); ?>:&nbsp;<span class="edd_cart_subtotal"><?php echo edd_cart_subtotal(); ?></span>
<?php _e( 'Subtotal', 'edd' ); ?>:&nbsp;<span class="edd_cart_subtotal_amount"><?php echo edd_cart_subtotal(); ?></span>
</th>
<?php do_action( 'edd_checkout_table_subtotal_last' ); ?>
</tr>
Expand Down

0 comments on commit 29090d0

Please sign in to comment.