diff options
author | Benny Baumann <BenBE@geshi.org> | 2014-11-29 13:56:01 +0100 |
---|---|---|
committer | Benny Baumann <BenBE@geshi.org> | 2014-11-29 13:56:01 +0100 |
commit | dd9d8f84843eef8c5e5d744c91116a0d532f655a (patch) | |
tree | d0639cbe8e220e36ca6325b20463e280f37a54a2 | |
parent | f535d495a1d1cf230770abaca301375ac7f46e49 (diff) | |
parent | 1cc5257aba1e6ae883caf464eaadf25783d2279d (diff) | |
download | cacert-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
-rwxr-xr-x | scripts/cron/warning.php | 2 | ||||
-rw-r--r-- | www/disputes.php | 2 | ||||
-rw-r--r-- | www/index.php | 1 |
3 files changed, 2 insertions, 3 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"); diff --git a/www/disputes.php b/www/disputes.php index bd6d5c1..0034b93 100644 --- a/www/disputes.php +++ b/www/disputes.php @@ -17,8 +17,8 @@ */ ?> <? require_once("../includes/loggedin.php"); - require_once("../includes/lib/l10n.php"); require_once("../includes/notary.inc.php"); + require_once("../includes/lib/l10n.php"); loadem("account"); diff --git a/www/index.php b/www/index.php index d16290a..b1efbfe 100644 --- a/www/index.php +++ b/www/index.php @@ -589,7 +589,6 @@ if ($oldid == 52 ) header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved } - showheader(_("Welcome to CAcert.org")); includeit($id); showfooter(); |