aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-07-23 13:42:30 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-07-23 13:42:30 +0200
commit505a74ad1de7cf2cd3605e793233365501f03d87 (patch)
tree41206132200aa9390e11d600ad2b84ffa23242e4 /index.php
parenta818ff2000c721c6f078c206c3f5214c558a5546 (diff)
parentebd6bf6007e0fad4c3e11dac0e79f687e1d195a2 (diff)
downloadwallabag-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-xindex.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/index.php b/index.php
index a26f458a..f191d7e7 100755
--- a/index.php
+++ b/index.php
@@ -9,8 +9,9 @@
9 */ 9 */
10 10
11define ('POCHE', '1.8.0'); 11define ('POCHE', '1.8.0');
12require 'check_setup.php'; 12require 'check_essentials.php';
13require_once 'inc/poche/global.inc.php'; 13require_once 'inc/poche/global.inc.php';
14require 'check_setup.php';
14 15
15// Start session 16// Start session
16Session::$sessionName = 'wallabag'; 17Session::$sessionName = 'wallabag';