]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of github.com:wallabag/wallabag into dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Wed, 23 Jul 2014 11:45:07 +0000 (13:45 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Wed, 23 Jul 2014 11:45:07 +0000 (13:45 +0200)

Trivial merge