diff options
author | Michael Tänzer <neo@nhng.de> | 2012-01-10 13:32:37 +0100 |
---|---|---|
committer | Michael Tänzer <neo@nhng.de> | 2012-01-10 13:32:37 +0100 |
commit | 923efbdb9d77f2976d2eb6584a1bb922c0cfaf90 (patch) | |
tree | ef816048edfdf64d07d33e4e5d55653db8ebdb00 /includes/general_stuff.php | |
parent | ffeed4b555aa9c0088c43d1dbfbd810d3b177c01 (diff) | |
parent | 22fb084237713f5041def5161a2df884b1b24f74 (diff) | |
download | cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.gz cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.tar.xz cacert-devel-923efbdb9d77f2976d2eb6584a1bb922c0cfaf90.zip |
Merge branch 'release' into bug-985bug-985
Conflicts:
www/wot.php
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/general_stuff.php')
-rw-r--r-- | includes/general_stuff.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/general_stuff.php b/includes/general_stuff.php index b4795e0..4c1bd30 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -133,7 +133,7 @@ if(!function_exists("showfooter")) </div> <? include("sponsorinfo.php") ?> <div id="siteInfo"> - <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | + <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> | <a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> | ©2002-<?=date("Y")?> <?=_("by CAcert")?></div> |