pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr

Browse Source 
Conflicts:
	inc/3rdparty/site_config
This commit is contained in:
Nicolas Lœuillet
2013-09-10 19:22:47 +02:00
parent f3a6080fce 964481d023
commit 12d9cfbcaa
7 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inc/poche/config.inc.php
View File

@ -37,6 +37,7 @@ require_once __DIR__ . '/../../inc/3rdparty/humble-http-agent/CookieJar.php';
require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedItem.php';
require_once __DIR__ . '/../../inc/3rdparty/feedwriter/FeedWriter.php';
require_once __DIR__ . '/../../inc/3rdparty/feedwriter/DummySingleItemFeed.php';
require_once __DIR__ . '/../../inc/3rdparty/FlattrItem.class.php';
if (DOWNLOAD_PICTURES) {
require_once __DIR__ . '/../../inc/poche/pochePictures.php';