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

Trivial merge