Merge branch 'dev' into refactor

Conflicts: check_setup.php index.php
2014-07-23 13:42:30 +02:00
parent a818ff2000 ebd6bf6007
commit 505a74ad1d
17 changed files with 846 additions and 347 deletions
--- a/index.php
+++ b/index.php
@ -9,8 +9,9 @@
 */

 define ('POCHE', '1.8.0');
-require 'check_setup.php';
+require 'check_essentials.php';
 require_once 'inc/poche/global.inc.php';
+require 'check_setup.php';

 // Start session
 Session::$sessionName = 'wallabag';