merge with main server

This commit is contained in:
Wookey 2015-09-06 11:59:58 +01:00
commit 71711347e0

View File

@ -646,7 +646,7 @@ inside...</p>
<div class="tripdate" id="t2007-07-18B">2007-07-18</div> <div class="tripdate" id="t2007-07-18B">2007-07-18</div>
<div class="trippeople">Olly Betts and <u>Jenny Black</u></div> <div class="trippeople">Olly Betts and <u>Jenny Black</u></div>
<div class="triptitle">Cave 2007-72 - Bath pot (2007-72)| </div> <div class="triptitle">Cave 2007-72 - Batter pot (2007-72) </div>
<p>It was a bit cloudy so decided that surface shaft might be feasible. <p>It was a bit cloudy so decided that surface shaft might be feasible.
Went to look at an entrance Olly spotted in 2005 roughly above Pancake Went to look at an entrance Olly spotted in 2005 roughly above Pancake