From: Jérémy Benoist Date: Tue, 3 Apr 2018 20:08:42 +0000 (+0200) Subject: Merge pull request #3615 from notFloran/3612-login-by-email X-Git-Tag: 2.3.3~11 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=11f15430ffc67e30f084cffc8e909ace87ce19e1;hp=08d6bedcaaaeb29ddb416708aff75c54b40baa05;p=github%2Fwallabag%2Fwallabag.git Merge pull request #3615 from notFloran/3612-login-by-email Allow login by email --- diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig index 3385cd53..9ebf1bed 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/_bookmarklet.html.twig @@ -1 +1 @@ -bag it! +bag it!