Merge with master

2013-10-02 11:20:48 +02:00
parent 1cd82159b0 bafe34d238
commit fd881b23f0
600 changed files with 33563 additions and 13429 deletions
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -5,7 +5,7 @@

 {* Breadcrumb *}
 {block name='no-return-functions' append}
-    {$breadcrumbs = [['name' => {intl l="Account"}, 'link'=>{url path="/account"}]]}
+    {$breadcrumbs = [['name' => {intl l="Register"}, 'link'=>{url path="/register"}]]}
 {/block}

 {block name="main-content"}