]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
authorThomas Citharel <tcit@tcit.fr>
Tue, 7 Jul 2015 16:18:32 +0000 (18:18 +0200)
committerThomas Citharel <tcit@tcit.fr>
Tue, 7 Jul 2015 16:18:32 +0000 (18:18 +0200)

Trivial merge