diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-11-21 22:15:17 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-11-21 22:15:17 +0100 |
commit | 7b8bb75228fff2a629388313a3d12cd63c846ad6 (patch) | |
tree | 8d8565fad43ab6bc5618a2372956ab792de521ec /inc | |
parent | 25f9c668348ae8d15e557bafc0e4aff2e2477e87 (diff) | |
parent | fe16457efc4365b8fa7b5879b1f8f8dc4e4a07bc (diff) | |
download | wallabag-7b8bb75228fff2a629388313a3d12cd63c846ad6.tar.gz wallabag-7b8bb75228fff2a629388313a3d12cd63c846ad6.tar.zst wallabag-7b8bb75228fff2a629388313a3d12cd63c846ad6.zip |
Merge pull request #942 from wallabag/carrot
implementing carrot into wallabag
Diffstat (limited to 'inc')
-rwxr-xr-x | inc/poche/Poche.class.php | 2 | ||||
-rwxr-xr-x | inc/poche/config.inc.default.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 16235474..27d6f4a6 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -812,4 +812,4 @@ class Poche | |||
812 | } | 812 | } |
813 | 813 | ||
814 | 814 | ||
815 | } | 815 | } \ No newline at end of file |
diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 304b3924..0f88f335 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php | |||
@@ -49,6 +49,7 @@ | |||
49 | @define ('NOT_FLATTRABLE', '0'); | 49 | @define ('NOT_FLATTRABLE', '0'); |
50 | @define ('FLATTRABLE', '1'); | 50 | @define ('FLATTRABLE', '1'); |
51 | @define ('FLATTRED', '2'); | 51 | @define ('FLATTRED', '2'); |
52 | @define ('CARROT', FALSE); | ||
52 | // display or not print link in article view | 53 | // display or not print link in article view |
53 | @define ('SHOW_PRINTLINK', '1'); | 54 | @define ('SHOW_PRINTLINK', '1'); |
54 | // display or not percent of read in article view. Affects only default theme. | 55 | // display or not percent of read in article view. Affects only default theme. |