From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 18 Dec 2016 13:32:41 +0000 (+0100)
Subject: More merge mess up fixes
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=de92edd6dd6c09625d0acda8009ebbed86b98f47;hp=de92edd6dd6c09625d0acda8009ebbed86b98f47;p=github%2Fshaarli%2FShaarli.git

More merge mess up fixes
---