summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2012-11-13 22:36:45 +0100
committerBenny Baumann <BenBE@geshi.org>2012-11-13 22:36:45 +0100
commit421c853f0bb3436af82d30a24a8f472fd98fc72f (patch)
treea32399cdd2e3ed459bcff5cf7114338994249c0e /pages
parent94e1086e842b1fccf16bdc8c911937fc9992e817 (diff)
parentca3ecaef2d5d126ad093350c49dc4bbf5e6eee90 (diff)
downloadcacert-devel-421c853f0bb3436af82d30a24a8f472fd98fc72f.tar.gz
cacert-devel-421c853f0bb3436af82d30a24a8f472fd98fc72f.tar.xz
cacert-devel-421c853f0bb3436af82d30a24a8f472fd98fc72f.zip
Merge branch 'bug-1114' into testserver
Diffstat (limited to 'pages')
-rw-r--r--pages/account/40.php7
-rw-r--r--pages/index/11.php9
2 files changed, 0 insertions, 16 deletions
diff --git a/pages/account/40.php b/pages/account/40.php
index b1a7fdb..b1e4fbf 100644
--- a/pages/account/40.php
+++ b/pages/account/40.php
@@ -72,14 +72,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
"<a href='mailto:support@cacert.org'>support@cacert.org</a>",
"<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p>
-<p><b><?=_("Snail Mail")?></b></p>
-<p><?=_("Alternatively you can get in contact with us via the following methods:")?></p>
-<p><?=_("Postal Address:")?><br>
-CAcert Inc.<br>
-P.O. Box 4107<br>
-Denistone East NSW 2112<br>
-Australia</p>
<script type="text/javascript">
<!--
diff --git a/pages/index/11.php b/pages/index/11.php
index 60c8941..62d9903 100644
--- a/pages/index/11.php
+++ b/pages/index/11.php
@@ -67,15 +67,6 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
<p><b><?=_("Security Issues")?></b></p>
<p><?=_("Please use any of the following ways to report security issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on <a href='https://bugs.cacert.org/'>bugs.cacert.org</a> and mark it as private.")?></p>
-<p><b><?=_("Snail Mail")?></b></p>
-<p><?=_("Alternatively you can get in contact with us via the following methods:")?></p>
-
-<p><?=_("Postal Address:")?><br>
-CAcert Inc.<br>
-P.O. Box 4107<br>
-Denistone East NSW 2112<br>
-Australia</p>
-
<script type="text/javascript">
<!--
var pagehash = '<?=$_SESSION['_config']['secrethash']?>';