]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'anno1337-dev' into dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 22 Jul 2014 19:45:21 +0000 (21:45 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Tue, 22 Jul 2014 19:45:21 +0000 (21:45 +0200)

Trivial merge