]> 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>
Thu, 21 Aug 2014 14:42:22 +0000 (16:42 +0200)
committerThomas Citharel <tcit@tcit.fr>
Thu, 21 Aug 2014 14:42:22 +0000 (16:42 +0200)

Trivial merge