summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-11-29 13:56:01 +0100
committerBenny Baumann <BenBE@geshi.org>2014-11-29 13:56:01 +0100
commitdd9d8f84843eef8c5e5d744c91116a0d532f655a (patch)
treed0639cbe8e220e36ca6325b20463e280f37a54a2 /scripts
parentf535d495a1d1cf230770abaca301375ac7f46e49 (diff)
parent1cc5257aba1e6ae883caf464eaadf25783d2279d (diff)
downloadcacert-devel-dd9d8f84843eef8c5e5d744c91116a0d532f655a.tar.gz
cacert-devel-dd9d8f84843eef8c5e5d744c91116a0d532f655a.tar.xz
cacert-devel-dd9d8f84843eef8c5e5d744c91116a0d532f655a.zip
Merge branch 'release' into testserver-stable
Conflicts: includes/account.php scripts/cron/warning.php www/disputes.php www/index.php
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/cron/warning.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php
index 813f402..59b1aa2 100755
--- a/scripts/cron/warning.php
+++ b/scripts/cron/warning.php
@@ -18,8 +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');
+ require_once(dirname(__FILE__).'/../../includes/lib/l10n.php');
$days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0");