diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-02 17:37:41 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-02 17:37:41 +0200 |
| commit | 77557d289bafc088baf806e4744f110dfd959300 (patch) | |
| tree | c097ca03a9a6fb7c453a5922e09d1e22381eb599 /src | |
| parent | 1dc3bee6b916b228c596a45d20dc6ae14ac555cb (diff) | |
| parent | c21f2924f39c99fbfb6ee2e0918726e9de2c5e27 (diff) | |
| download | wallabag-77557d289bafc088baf806e4744f110dfd959300.tar.gz wallabag-77557d289bafc088baf806e4744f110dfd959300.tar.zst wallabag-77557d289bafc088baf806e4744f110dfd959300.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Wallabag/CoreBundle/Helper/EntriesExport.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 25 | private $footerTemplate = '<div style="text-align:center;"> | 25 | private $footerTemplate = '<div style="text-align:center;"> |
| 26 | <p>Produced by wallabag with %EXPORT_METHOD%</p> | 26 | <p>Produced by wallabag with %EXPORT_METHOD%</p> |
| 27 | <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p> | 27 | <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p> |
| 28 | </div'; | 28 | </div>'; |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database | 31 | * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database |