From: VirtualTam <virtualtam+github@flibidi.net>
Date: Wed, 20 Jun 2018 15:18:47 +0000 (+0200)
Subject: Merge pull request #1154 from virtualtam/changelog
X-Git-Tag: v0.10.0~18
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=7519388dd67430c6d37c495c34934f2d5c5c191e

Merge pull request #1154 from virtualtam/changelog

Update AUTHORS and CHANGELOG
---

7519388dd67430c6d37c495c34934f2d5c5c191e