summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2015-06-11 17:01:00 +0200
committerAnne Jan Brouwer <annejan@noprotocol.com>2015-06-11 17:01:00 +0200
commit7db530db025fea75d87164d8729fded43621cfff (patch)
tree03d61f0a538e33e59a340c84588514038f9f1777 /README.md
parent5ca6c7e7d0ecb13da3aa59b920e39e72ee1c68f5 (diff)
parentae415d3c20f9fba235672152bffa445dd27775e4 (diff)
Merge branch 'master' into develop
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 51191048..394cd2aa 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Planned features
* ~~Profiles (to allow use of multiple password stores and decryption keys) with dropdown in main screen~~
* Password generation with options for what kind you'd like
* Templates (username, url etc) in Add / Edit screen (configurable templates)
-* Colour coding or disabling of people you can't encrypt for (trust settings) in User management
+* ~~Colour coding or disabling of people you can't encrypt for (trust settings) in User management~~
* Colour coding folders (possibly disabling folders you can't decrypt)
* WebDAV (configuration) support
* Optional table view of decrypted folder contents