]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'fix/securityAllowedActions' into dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Fri, 25 Jul 2014 05:27:21 +0000 (07:27 +0200)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Fri, 25 Jul 2014 05:27:21 +0000 (07:27 +0200)

Trivial merge