mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-29 04:21:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:wallabag/wallabag into dev

Browse source
This commit is contained in:
Thomas Citharel 2015-02-19 01:39:47 +01:00
commit 9e5dc91c03
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -4,6 +4,6 @@ wallabag is a self hostable application allowing you to not miss any content any
More informations on our website: [wallabag.org](http://wallabag.org) More informations on our website: [wallabag.org](http://wallabag.org)
## License ## License
Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org> Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
This work is free. You can redistribute it and/or modify it under the This work is free. You can redistribute it and/or modify it under the
terms of the MIT License. See the COPYING file for more details. terms of the MIT License. See the COPYING file for more details.

2
inc/poche/Poche.class.php
View file

@ -761,7 +761,7 @@ class Poche
Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).'); Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
} }
else { else {
$this->messages->add('s', _('Did you forget to select a file?')); $this->messages->add('e', _('Did you forget to select a file?'));
} }
// file parsing finished here // file parsing finished here
// now download article contents if any // now download article contents if any