diff options
| author | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-09-10 19:22:47 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas.loeuillet@gmail.com> | 2013-09-10 19:22:47 +0200 |
| commit | 12d9cfbcaa236a7d1aa3208a836519af1e1af8ce (patch) | |
| tree | 939a744a000668327e29293826564e3a9e3d0da3 /inc/poche/config.inc.php | |
| parent | f3a6080fce5d0473b6452a5984a2092c97df77ec (diff) | |
| parent | 964481d023676bee964141a1d14f638995ac8d30 (diff) | |
| download | wallabag-12d9cfbcaa236a7d1aa3208a836519af1e1af8ce.tar.gz wallabag-12d9cfbcaa236a7d1aa3208a836519af1e1af8ce.tar.zst wallabag-12d9cfbcaa236a7d1aa3208a836519af1e1af8ce.zip | |
Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr
Conflicts:
inc/3rdparty/site_config
Diffstat (limited to 'inc/poche/config.inc.php')
| -rwxr-xr-x | inc/poche/config.inc.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php index 7f1b8c92..45526695 100755 --- a/inc/poche/config.inc.php +++ b/inc/poche/config.inc.php | |||
| @@ -37,6 +37,7 @@ require_once __DIR__ . '/../../inc/3rdparty/humble-http-agent/CookieJar.php'; | |||
| 37 | require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedItem.php'; | 37 | require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedItem.php'; |
| 38 | require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedWriter.php'; | 38 | require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedWriter.php'; |
| 39 | require_once __DIR__ . '/../../inc/3rdparty/feedwriter/DummySingleItemFeed.php'; | 39 | require_once __DIR__ . '/../../inc/3rdparty/feedwriter/DummySingleItemFeed.php'; |
| 40 | require_once __DIR__ . '/../../inc/3rdparty/FlattrItem.class.php'; | ||
| 40 | 41 | ||
| 41 | if (DOWNLOAD_PICTURES) { | 42 | if (DOWNLOAD_PICTURES) { |
| 42 | require_once __DIR__ . '/../../inc/poche/pochePictures.php'; | 43 | require_once __DIR__ . '/../../inc/poche/pochePictures.php'; |