diff options
| author | Nicolas Frandeboeuf <nicofrand@gmail.com> | 2013-08-22 00:57:11 +0200 |
|---|---|---|
| committer | Nicolas Frandeboeuf <nicofrand@gmail.com> | 2013-08-22 00:57:11 +0200 |
| commit | 57c91e427d20d520bc506bef52189a86d72a9255 (patch) | |
| tree | 43fbcf6eac2fc1a913c796a5631a7ba874af9693 /inc/poche/config.inc.php | |
| parent | 2bf93dc0345e304656ed9a931f9941fd7117ddfe (diff) | |
| parent | 746f93c290881d97997b8179395de2875eb57c71 (diff) | |
| download | wallabag-57c91e427d20d520bc506bef52189a86d72a9255.tar.gz wallabag-57c91e427d20d520bc506bef52189a86d72a9255.tar.zst wallabag-57c91e427d20d520bc506bef52189a86d72a9255.zip | |
Merge branch 'dev' of https://github.com/nicofrand/poche into dev
Diffstat (limited to 'inc/poche/config.inc.php')
| -rwxr-xr-x | inc/poche/config.inc.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php index 4122ff10..cb882cd0 100755 --- a/inc/poche/config.inc.php +++ b/inc/poche/config.inc.php | |||
| @@ -15,9 +15,9 @@ if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) { | |||
| 15 | die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>'); | 15 | die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>'); |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { | 18 | // if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { |
| 19 | require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; | 19 | // require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; |
| 20 | } | 20 | // } |
| 21 | require_once __DIR__ . '/../../inc/poche/User.class.php'; | 21 | require_once __DIR__ . '/../../inc/poche/User.class.php'; |
| 22 | require_once __DIR__ . '/../../inc/poche/Url.class.php'; | 22 | require_once __DIR__ . '/../../inc/poche/Url.class.php'; |
| 23 | require_once __DIR__ . '/../../inc/3rdparty/class.messages.php'; | 23 | require_once __DIR__ . '/../../inc/3rdparty/class.messages.php'; |