Merge branch 'stable'

This commit is contained in:
azivner
2017-11-13 23:42:23 -05:00
7 changed files with 50 additions and 3 deletions
+14
View File
@@ -153,6 +153,7 @@
<li><a href="#change-password">Change password</a></li>
<li><a href="#encryption-timeout">Encryption timeout</a></li>
<li><a href="#history-snapshot-time-interval">History snapshots</a></li>
<li><a href="#about">About Trilium</a></li>
</ul>
<div id="change-password">
<form id="change-password-form">
@@ -199,6 +200,19 @@
<button class="btn btn-sm">Save</button>
</form>
</div>
<div id="about">
<table class="table">
<tr>
<th>Build date:</th>
<td id="build-date"></td>
</tr>
<tr>
<th>Build revision:</th>
<td><a href="" target="_blank" id="build-revision"></a></td>
</tr>
</table>
</div>
</div>
</div>