diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-03-15 23:12:45 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-03-15 23:12:45 +0100 |
| commit | 6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa (patch) | |
| tree | 5c2f8a0f4dd1074b8c15bc2b0c20e4399769dfae | |
| parent | 44a40c4c31919fa5e99c001a0ec20c3379faa3e3 (diff) | |
| parent | 30e4fd6a7e399d343b37b728f1d9cf27aa3c4bc7 (diff) | |
| download | cacert-devel-6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa.tar.gz cacert-devel-6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa.tar.xz cacert-devel-6008db0778c3c8b394a6fc5a65b2fa0aeb7189aa.zip | |
Merge branch 'bug-910' into release
Conflicts:
pages/index/8.php
| -rw-r--r-- | includes/about_menu.php | 2 | ||||
| -rw-r--r-- | pages/index/8.php | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/includes/about_menu.php b/includes/about_menu.php index f354cfc..2f3080d 100644 --- a/includes/about_menu.php +++ b/includes/about_menu.php @@ -11,7 +11,7 @@ <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?> <li><a href="/stats.php"><?=_("CAcert Statistics")?></a></li> <? } ?> <li><a href="http://blog.CAcert.org/feed/"><?=_("RSS News Feed")?></a></li> <? //- <li><a href="/index.php?id=7"> < ? = _ ( " Credits " ) ? > </a></li> ?> - <li><a href="/index.php?id=8"><?=_("CAcert Board")?></a></li> + <li><a href="//wiki.cacert.org/Board"><?=_("CAcert Board")?></a></li> <li><a href="https://lists.cacert.org/wws"><?=_("Mailing Lists")?></a></li> <li><a href="/src-lic.php"><?=_("Sourcecode")?></a></li> </ul> diff --git a/pages/index/8.php b/pages/index/8.php index 8eb26ab..e45090d 100644 --- a/pages/index/8.php +++ b/pages/index/8.php @@ -18,10 +18,13 @@ <p><b><? printf(_("The current %s board, and roles."), "CAcert Inc."); ?></b></p> <p> Lambert Hofstra - <?=_("President")?><br/> -Mark Lipscombe - <?=_("Secretary")?><br/> -Nick Bebout - <?=_("member")?><br/> +Peter Yuill - <?=_("Vice President")?><br/> +Alexander Prinsier - <?=_("Treasurer")?><br/> +Mario Lipinski - <?=_("Secretary")?><br/> +Piers Lauder - <?=_("member")?><br/> Ian Grigg - <?=_("member")?><br/> -Mario Lipinski - <?=_("member")?><br/> -Alexander Prinsier - <?=_("member")?><br/> -Kevin Dawson - <?=_("Public Officer")?><br/> +Dirk Astrath - <?=_("member")?><br/> </p> +Kevin Dawson - <?=_("Public Officer")?><br /> +<br /> +More detailed informations can be found in the CAcert wiki under <a href="//wiki.cacert.org/Board"><?=_("CAcert Board")?></a> |