]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Mon, 3 Feb 2014 10:56:01 +0000 (11:56 +0100)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Mon, 3 Feb 2014 10:56:01 +0000 (11:56 +0100)

Trivial merge