]> 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, 11 May 2014 13:44:43 +0000 (15:44 +0200)
committertcit <tcit@tcit.fr>
Sun, 11 May 2014 13:44:43 +0000 (15:44 +0200)

Trivial merge