]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of http://github.com/wallabag/wallabag into dev
authorThomas Citharel <tcit@tcit.fr>
Sat, 13 Jun 2015 08:34:34 +0000 (10:34 +0200)
committerThomas Citharel <tcit@tcit.fr>
Sat, 13 Jun 2015 08:34:34 +0000 (10:34 +0200)

Trivial merge