Merge whoandwhen changes on server

This commit is contained in:
Wookey 2017-06-01 00:17:31 +01:00
commit 2cd5b3fd96

View File

@ -146,6 +146,66 @@ table.fancy td.nonempty { background: #eee }
<td>no</td>
<td>arrive from the dolomites with Wob and richard, looking for a lift home</td>
</tr>
<tr>
<td>Luke Stangroom</td>
<td>3/4 weeks</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>maybe</td>
<td>no</td>
<td>no</td>
<td>no</td>
<td>arrive with Brendan,George,Nathan unsure how Im getting back to England</td>
</tr>
<tr>
<td>Brendan Hall</td>
<td>4-6 weeks</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>maybe</td>
<td>maybe</td>
<td>no</td>
<td>arrive from the dolomites with George B, Nathan W and Luke, staying for the first couple of weeks might head home earlier if I need to go back for work. S</td>
</tr>
<tr>
<td>Nathan Walker</td>
<td>4-6 weeks</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>maybe</td>
<td>maybe</td>
<td>no</td>
<td>arrive from the dolomites with George B, Brendan H and Luke, staying for the first couple of weeks might head home earlier if I need to. S</td>
</tr>
<tr>
<td>Alice Shackley</td>
<td>2/3 weeks</td>
<td>no</td>
<td>no</td>
<td>no</td>
<td>maybe</td>
<td>yes</td>
<td>yes</td>
<td>no</td>
<td>Looking for transport to and from Leeds</td>
</tr>
<tr>
<td>Sarah Connolly</td>
<td>2 weeks</td>
<td>no</td>
<td>no</td>
<td>no</td>
<td>no</td>
<td>yes</td>
<td>yes</td>
<td>no</td>
<td>transport not planned yet</td>
</tr>
<tr>
<td>Some One Else</td>
<td>2 weeks</td>
@ -169,8 +229,8 @@ table.fancy td.nonempty { background: #eee }
<ul>
<li><b>Car 1</b>: Elaine's Car/Van</li>
<li><b>Car 2</b>: Eliott's Van</li>
<li><b>Car 3</b>: Brendan/Nathan Car</li>
</ul>
<table class="fancy">
<tr>
<th rowspan="2">Who&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
@ -184,14 +244,23 @@ table.fancy td.nonempty { background: #eee }
<th>Mode</th>
<th>Date</th>
</tr>
<tr>
<tr>
<td>Elaine Oliver</td>
<td>Jul 8</td>
<td>Car 1</td>
<td>Aug 12</td>
<td>Jul 8th</td>
<td>Car 1</td>
<td>Aug 12th</td>
<td>Out and back in Elaine's Car/van</td>
</tr>
<tr>
<td>Brendan Hall/Nathan</td>
<td>Car 3</td>
<td>Jul 8th</td>
<td>Car 3</td>
<td>Aug 6th</td>
<td>Hopefully out and back in our car, although it's pretty old so might die before we get there/back,
fingers crossed!</td>
</tr>
<tr>
<td>Some One</td>
<td></td>
@ -200,7 +269,6 @@ table.fancy td.nonempty { background: #eee }
<td></td>
<td></td>
</tr>
</table>