Merge branch 'bug-1177' into bug-893
authorBenny Baumann <BenBE@geshi.org>
Sun, 21 Jul 2013 20:33:04 +0000 (22:33 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 21 Jul 2013 20:33:04 +0000 (22:33 +0200)
Conflicts:
includes/account.php

1  2 
includes/account.php
www/disputes.php

@@@ -17,8 -17,7 +17,8 @@@
  */
        require_once("../includes/loggedin.php");
        require_once("../includes/lib/l10n.php");
-       require_once('lib/check_weak_key.php');
+       require_once("../includes/lib/check_weak_key.php");
 +      require_once("../includes/temp_functions.php");
  
        loadem("account");
  
Simple merge