diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-23 13:42:30 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-07-23 13:42:30 +0200 |
| commit | 505a74ad1de7cf2cd3605e793233365501f03d87 (patch) | |
| tree | 41206132200aa9390e11d600ad2b84ffa23242e4 /index.php | |
| parent | a818ff2000c721c6f078c206c3f5214c558a5546 (diff) | |
| parent | ebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff) | |
| download | wallabag-505a74ad1de7cf2cd3605e793233365501f03d87.tar.gz wallabag-505a74ad1de7cf2cd3605e793233365501f03d87.tar.zst wallabag-505a74ad1de7cf2cd3605e793233365501f03d87.zip | |
Merge branch 'dev' into refactor
Conflicts:
check_setup.php
index.php
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.8.0'); | 11 | define ('POCHE', '1.8.0'); |
| 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 | // Start session | 16 | // Start session |
| 16 | Session::$sessionName = 'wallabag'; | 17 | Session::$sessionName = 'wallabag'; |