Merge remote-tracking branch 'origin/master' into 2.1

2016-08-28 16:15:27 +02:00
parent 13d44ca766 985f5f9d05
commit cdd3010b47
13 changed files with 192 additions and 6 deletions
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@ -41,7 +41,7 @@
            <i class="material-icons right">send</i>
        </button>
    </div>
-    <div class="center">
+    <div class="row center">
        <a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
    </div>
 </form>