diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2015-02-19 01:39:47 +0100 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2015-02-19 01:39:47 +0100 |
| commit | 9e5dc91c0383973470f2292b1ec123c48e908e17 (patch) | |
| tree | 0ea2b7eb9db0a1cf5c12f52a0a877fbd1ebb043c | |
| parent | 8cebef88ec2c8454e13ac6509528e96fd1a0e008 (diff) | |
| parent | 520a573c50cbeec2d892c19b9fd4eaa1e90e7486 (diff) | |
| download | wallabag-9e5dc91c0383973470f2292b1ec123c48e908e17.tar.gz wallabag-9e5dc91c0383973470f2292b1ec123c48e908e17.tar.zst wallabag-9e5dc91c0383973470f2292b1ec123c48e908e17.zip | |
Merge branch 'dev' of github.com:wallabag/wallabag into dev
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | inc/poche/Poche.class.php | 2 |
2 files changed, 2 insertions, 2 deletions
| @@ -4,6 +4,6 @@ wallabag is a self hostable application allowing you to not miss any content any | |||
| 4 | More informations on our website: [wallabag.org](http://wallabag.org) | 4 | More informations on our website: [wallabag.org](http://wallabag.org) |
| 5 | 5 | ||
| 6 | ## License | 6 | ## License |
| 7 | Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org> | 7 | Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org> |
| 8 | This work is free. You can redistribute it and/or modify it under the | 8 | This work is free. You can redistribute it and/or modify it under the |
| 9 | terms of the MIT License. See the COPYING file for more details. | 9 | terms of the MIT License. See the COPYING file for more details. |
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 6a48f2ad..30d42c61 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
| @@ -761,7 +761,7 @@ class Poche | |||
| 761 | Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).'); | 761 | Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).'); |
| 762 | } | 762 | } |
| 763 | else { | 763 | else { |
| 764 | $this->messages->add('s', _('Did you forget to select a file?')); | 764 | $this->messages->add('e', _('Did you forget to select a file?')); |
| 765 | } | 765 | } |
| 766 | // file parsing finished here | 766 | // file parsing finished here |
| 767 | // now download article contents if any | 767 | // now download article contents if any |