From: Nicolas Lœuillet Date: Wed, 23 Jul 2014 11:45:07 +0000 (+0200) Subject: Merge branch 'dev' of github.com:wallabag/wallabag into dev X-Git-Tag: 1.8.0^2~25^2~2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=6da20812ce04e3e45c21c6da640d6ccde91e8c38;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of github.com:wallabag/wallabag into dev --- 6da20812ce04e3e45c21c6da640d6ccde91e8c38