Merge branch 'hotfixes' into develop

Conflicts: oc-admin/themes/modern/market/themes.php
osclass · Nov 12, 2012 · 1a6ea41 · 1a6ea41
2 parents d711c5f + 1285958
commit 1a6ea41
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/oc-admin/themes/modern/market/themes.php b/oc-admin/themes/modern/market/themes.php
@@ -84,7 +84,7 @@ function customPageTitle($string) {
                                 </tr>
                                 <tr class="even">
                                     <td><?php _e('URL') ; ?></td>
-                                    <td><span><a id="market_url" href="#"><?php _e("Download manually"); ?></a></span></td>
+                                    <td><span id="market_url_span"><a id="market_url" href="#"><?php _e("Download manually"); ?></a></span></td>
                                 </tr>
                             </tbody>
                         </table>