diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-07-22 21:45:21 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-07-22 21:45:21 +0200 |
commit | ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (patch) | |
tree | c24e74e85fc98ee7989f79707f7854eb60756279 /index.php | |
parent | f83ffc3ac3c843c17587827ad85f278818f69d78 (diff) | |
parent | 1f78bd8471661ece8b386996ed30fd56255a2280 (diff) | |
download | wallabag-ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2.tar.gz wallabag-ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2.tar.zst wallabag-ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2.zip |
Merge branch 'anno1337-dev' into dev
Diffstat (limited to 'index.php')
-rwxr-xr-x | index.php | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -9,8 +9,9 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | define ('POCHE', '1.7.1'); | 11 | define ('POCHE', '1.7.1'); |
12 | require 'check_setup.php'; | 12 | require 'check_essentials.php'; |
13 | require_once 'inc/poche/global.inc.php'; | 13 | require_once 'inc/poche/global.inc.php'; |
14 | require 'check_setup.php'; | ||
14 | 15 | ||
15 | # Set error reporting level | 16 | # Set error reporting level |
16 | if (defined('ERROR_REPORTING')) { | 17 | if (defined('ERROR_REPORTING')) { |