From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Fri, 25 Jul 2014 05:27:21 +0000 (+0200)
Subject: Merge branch 'fix/securityAllowedActions' into dev
X-Git-Tag: 1.8.0^2~25
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=fa9a7bbb3c61116e5db76c9f25ef2340fef971d7;hp=830612f555d8bc72669fe9bc0686680001af0e52;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'fix/securityAllowedActions' into dev
---