]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of github.com:wallabag/wallabag into dev
authorThomas Citharel <tcit@tcit.fr>
Wed, 4 Feb 2015 21:18:28 +0000 (22:18 +0100)
committerThomas Citharel <tcit@tcit.fr>
Wed, 4 Feb 2015 21:18:28 +0000 (22:18 +0100)

Trivial merge