aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-07-22 21:26:02 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-07-22 21:26:02 +0200
commit1f78bd8471661ece8b386996ed30fd56255a2280 (patch)
treec24e74e85fc98ee7989f79707f7854eb60756279 /index.php
parentf83ffc3ac3c843c17587827ad85f278818f69d78 (diff)
parent9c67b1b829290e5e78cb7da90acf285d6cd5c48f (diff)
downloadwallabag-1f78bd8471661ece8b386996ed30fd56255a2280.tar.gz
wallabag-1f78bd8471661ece8b386996ed30fd56255a2280.tar.zst
wallabag-1f78bd8471661ece8b386996ed30fd56255a2280.zip
Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev
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 481841ec..cce10b50 100755
--- a/index.php
+++ b/index.php
@@ -9,8 +9,9 @@
9 */ 9 */
10 10
11define ('POCHE', '1.7.1'); 11define ('POCHE', '1.7.1');
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# Set error reporting level 16# Set error reporting level
16if (defined('ERROR_REPORTING')) { 17if (defined('ERROR_REPORTING')) {