]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
authortcit <tcit@tcit.fr>
Sun, 28 Sep 2014 15:32:50 +0000 (17:32 +0200)
committertcit <tcit@tcit.fr>
Sun, 28 Sep 2014 15:32:50 +0000 (17:32 +0200)

Trivial merge