Merge branch 'bug-1273' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 21 Oct 2014 20:46:02 +0000 (22:46 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 21 Oct 2014 20:46:02 +0000 (22:46 +0200)
Conflicts:
scripts/cron/warning.php

1  2 
scripts/cron/warning.php

@@@ -18,7 -18,7 +18,8 @@@
  */
  
        require_once(dirname(__FILE__).'/../../includes/mysql.php');
 +      require_once(dirname(__FILE__).'/../../includes/lib/l10n.php');
+       require_once(dirname(__FILE__).'/../../includes/lib/general.php');
  
        $days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0");