aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-08-19 12:39:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-08-19 12:39:28 -0300
commit4ca3799ecc5185db9e10ae5fc4caefb6e1c76fab (patch)
tree9823e0ba558f28c0c872a5aaa681a2e08a991867
parentb0d0526a65415eb284f0bd25a15d6f81ea4e0d79 (diff)
parentd8a94f16ac9ac1b0bf2344b1d27f2e1e597ab5a6 (diff)
downloadkeyringer-4ca3799ecc5185db9e10ae5fc4caefb6e1c76fab.tar.gz
keyringer-4ca3799ecc5185db9e10ae5fc4caefb6e1c76fab.tar.bz2
Merge branch 'develop'
-rw-r--r--ChangeLog4
-rw-r--r--README.md2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 81e4d25..2fd20ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-08-19 - unreleased - Silvio Rhatto <rhatto@riseup.net>
+
+ Moved docs to the README, favouring the GitLab repository over the site
+
2022-08-19 - 0.5.8 - Silvio Rhatto <rhatto@riseup.net>
Fix re-encryption when the secret hass NULL bytes
diff --git a/README.md b/README.md
index 6ca6741..4552873 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ commands to encrypt, decrypt, recrypt, create key pairs, etc.
Index
-----
-[[TOC]]
+[TOC]
Installation
------------