Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Jeremy Benoist 2016-10-02 17:37:41 +02:00
commit 77557d289b
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C

View file

@ -25,7 +25,7 @@ class EntriesExport
private $footerTemplate = '<div style="text-align:center;"> private $footerTemplate = '<div style="text-align:center;">
<p>Produced by wallabag with %EXPORT_METHOD%</p> <p>Produced by wallabag with %EXPORT_METHOD%</p>
<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> <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>
</div'; </div>';
/** /**
* @param Config $craueConfig CraueConfig instance to get wallabag instance url from database * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database