aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/global.inc.php
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-12-22 14:33:01 +0100
committerThomas Citharel <tcit@tcit.fr>2014-12-22 14:33:01 +0100
commitf3917b1ee4bba812e82da57dd181f50d62926db4 (patch)
treecb4b04931e97e4a69500bf9d7aa5c21985cab59e /inc/poche/global.inc.php
parent311baf86befde0557faea614ca4d13bb2bd2cc66 (diff)
parent9254b6cf460edec3a59e9ccc19873481a1d19c90 (diff)
downloadwallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.tar.gz
wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.tar.zst
wallabag-f3917b1ee4bba812e82da57dd181f50d62926db4.zip
Merge branch 'dev' into randomarticle
Diffstat (limited to 'inc/poche/global.inc.php')
-rwxr-xr-xinc/poche/global.inc.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index b8c487e3..728528f8 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -22,7 +22,7 @@ require_once ROOT . '/vendor/autoload.php';
22require_once INCLUDES . '/poche/Template.class.php'; 22require_once INCLUDES . '/poche/Template.class.php';
23require_once INCLUDES . '/poche/Language.class.php'; 23require_once INCLUDES . '/poche/Language.class.php';
24require_once INCLUDES . '/poche/Routing.class.php'; 24require_once INCLUDES . '/poche/Routing.class.php';
25require_once INCLUDES . '/poche/WallabagEpub.class.php'; 25require_once INCLUDES . '/poche/WallabagEBooks.class.php';
26require_once INCLUDES . '/poche/Poche.class.php'; 26require_once INCLUDES . '/poche/Poche.class.php';
27 27
28require_once INCLUDES . '/poche/Database.class.php'; 28require_once INCLUDES . '/poche/Database.class.php';
@@ -41,6 +41,13 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
41require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php'; 41require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
42require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php'; 42require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
43 43
44# mobi library
45require_once INCLUDES . '/3rdparty/libraries/MOBIClass/MOBI.php';
46
47# pdf library
48#require_once INCLUDES . '/3rdparty/libraries/mpdf/mpdf.php';
49require_once INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php';
50
44# system configuration; database credentials et caetera 51# system configuration; database credentials et caetera
45require_once INCLUDES . '/poche/config.inc.php'; 52require_once INCLUDES . '/poche/config.inc.php';
46require_once INCLUDES . '/poche/config.inc.default.php'; 53require_once INCLUDES . '/poche/config.inc.default.php';