ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/web/www/who.xhtml
(Generate patch)

Comparing web/www/who.xhtml (file contents):
Revision 1.31 by tdb, Fri Jun 21 16:50:17 2013 UTC vs.
Revision 1.33 by tdb, Fri Aug 9 02:20:37 2013 UTC

# Line 31 | Line 31
31              Current team
32            </h2>
33            <p>
34 <            <b>Tim Bishop</b> - tdb@i-scream.org
34 >            <b>Tim Bishop</b> - tdb@i-scream.org - PGP Key 0x6C226B37FDF38D55
35            </p>
36            <ul>
37              <li>
# Line 48 | Line 48
48              <b>Alex Moore</b>
49            </p>
50            <p>
51 <            <b>Adam Sampson</b> - ats@offog.org
51 >            <b>Jens Rehsack</b>
52            </p>
53            <p>
54 <            <b>Jens Rehsack</b>
54 >            <b>Adam Sampson</b> - ats@offog.org
55            </p>
56            <ul>
57              <li>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines