From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Mon, 2 May 2016 18:08:04 +0000 (+0200)
Subject: Merge pull request #2012 from biva/patch-2
X-Git-Tag: 2.0.4~15
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ba9fee085597932f451741b47ad7013e7eb4323b;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2012 from biva/patch-2

integrate upgrade.rst
---

ba9fee085597932f451741b47ad7013e7eb4323b