From: Jeremy Benoist Date: Sun, 2 Oct 2016 15:37:41 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into 2.1 X-Git-Tag: 2.1.0~6 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=77557d289bafc088baf806e4744f110dfd959300;hp=1dc3bee6b916b228c596a45d20dc6ae14ac555cb;p=github%2Fwallabag%2Fwallabag.git Merge remote-tracking branch 'origin/master' into 2.1 --- diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index 1dfa12c8..0c627dcd 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php @@ -25,7 +25,7 @@ class EntriesExport private $footerTemplate = '

Produced by wallabag with %EXPORT_METHOD%

Please open an issue if you have trouble with the display of this E-Book on your device.

- '; /** * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database