Merge branch 'master' into frontend

Conflicts: templates/default/I18n/en_US.php Reorder all I18N files
2013-11-07 11:09:07 +01:00
parent 483fd52734 c6cd32fec2
commit 4007ae39d4
40 changed files with 1472 additions and 1406 deletions
--- a/templates/default/includes/addedToCart.html
+++ b/templates/default/includes/addedToCart.html
@@ -1,5 +1,5 @@
 <div class="clearfix">
-    {loop type="cart" name="cartloop" position="last"}
+    {loop type="cart" name="cartloop" limit="1" order="reverse"}
        <table>
            <tr>
                <td class="col-md-4">