]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of github.com:wallabag/wallabag into dev
authorThomas Citharel <tcit@tcit.fr>
Sat, 24 Jan 2015 13:35:36 +0000 (14:35 +0100)
committerThomas Citharel <tcit@tcit.fr>
Sat, 24 Jan 2015 13:35:36 +0000 (14:35 +0100)

Trivial merge