diff options
| author | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-06-11 17:01:00 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-06-11 17:01:00 +0200 |
| commit | b36b79153b73606261018bfbe1b7395c2ecf54fb (patch) | |
| tree | 03d61f0a538e33e59a340c84588514038f9f1777 | |
| parent | 947ade4ea102673cd2ff428be7788803fac288bc (diff) | |
| parent | a3167fa986a4b733118853b984497e5a76161bda (diff) | |
Merge branch 'master' into develop
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |