]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'fix/securityMaster' 1.7.2
authorNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 24 Jul 2014 19:41:16 +0000 (21:41 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 24 Jul 2014 19:41:16 +0000 (21:41 +0200)

Trivial merge