diff options
| author | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 14:25:24 +0200 |
|---|---|---|
| committer | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 14:25:24 +0200 |
| commit | 5e07dc8b51f9612de5f5a00bbac399c777e82fa4 (patch) | |
| tree | 66454b9a6dd4e8cd045dd8451a268cf914e583b8 /inc/poche/config.inc.php.new | |
| parent | 2916d24b209e1e36cf22cb902d7e6dc34113c7e5 (diff) | |
| parent | 894c36ea32d38d425e27dae43a29dcd9e669040e (diff) | |
| download | wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.tar.gz wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.tar.zst wallabag-5e07dc8b51f9612de5f5a00bbac399c777e82fa4.zip | |
Merge remote branch 'upstream/dev' into dev
Conflicts:
themes/default/_head.twig
Diffstat (limited to 'inc/poche/config.inc.php.new')
| -rwxr-xr-x | inc/poche/config.inc.php.new | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new index 902509e3..c60d4f80 100755 --- a/inc/poche/config.inc.php.new +++ b/inc/poche/config.inc.php.new | |||
| @@ -52,8 +52,6 @@ define ('CACHE', ROOT . '/cache'); | |||
| 52 | 52 | ||
| 53 | define ('PAGINATION', '10'); | 53 | define ('PAGINATION', '10'); |
| 54 | 54 | ||
| 55 | define ('POCHE_VERSION', '1.0.0'); | ||
| 56 | |||
| 57 | define ('POCKET_FILE', '/ril_export.html'); | 55 | define ('POCKET_FILE', '/ril_export.html'); |
| 58 | define ('READABILITY_FILE', '/readability'); | 56 | define ('READABILITY_FILE', '/readability'); |
| 59 | define ('INSTAPAPER_FILE', '/instapaper-export.html'); | 57 | define ('INSTAPAPER_FILE', '/instapaper-export.html'); |