Rebasing from master.
I had started work on a new feature on the production branch. Master having been protected.
This commit is contained in:
parent
b10810b120
commit
de2e79491c
@ -109,14 +109,13 @@
|
||||
<br/>
|
||||
<label for="originalTZ">Display original timezone</label>
|
||||
<input type="checkbox" name="originalTZ" value="origTZ">
|
||||
<span class="chkbox>
|
||||
<span class="chkbox">
|
||||
<label for="displayOffset">Display offset of selected timezones</label>
|
||||
<input type="checkbox" name="displayOffset" value="disOS"/>
|
||||
</span>
|
||||
</form>
|
||||
<p id="JStz"><?php echo date("e");?></p>
|
||||
<h3>Timer</h3>
|
||||
<a href="timer/" title="The timer page">Timer</a>
|
||||
|
||||
</div><!--end of "body" div-->
|
||||
</body>
|
||||
</html>
|
||||
|
Loading…
x
Reference in New Issue
Block a user