]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 18 Feb 2014 20:22:41 +0000 (21:22 +0100)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 18 Feb 2014 20:22:41 +0000 (21:22 +0100)

Trivial merge