]> 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, 7 Mar 2015 23:23:10 +0000 (00:23 +0100)
committerThomas Citharel <tcit@tcit.fr>
Sat, 7 Mar 2015 23:23:10 +0000 (00:23 +0100)

Trivial merge