From 65225262f6bb524b93feb49178509cada3390ee3 Mon Sep 17 00:00:00 2001
From: Kyle Francis <franck6@rpi.edu>
Date: Sat, 02 Apr 2016 18:33:17 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into compose_focus

---
 plugins/enigma/README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/enigma/README b/plugins/enigma/README
index ac20b79..d9fc379 100644
--- a/plugins/enigma/README
+++ b/plugins/enigma/README
@@ -18,6 +18,7 @@
 + PGP: key generation (client- or server-side)
 + Handling of PGP keys attached to incoming messages
 + User preferences to disable plugin features
++ Attaching public keys to email
 
 
 TODO:
@@ -33,7 +34,6 @@
 - Generate revocation certs
 - Search filter to see invalid/expired keys
 - Key server(s) support (search, import, upload, refresh)
-- Attaching public keys to email
 - Mark keys as trusted/untrasted, display appropriate message in verify/decrypt status
 - Change attachment icon on messages list for encrypted messages (like vcard_attachment plugin does)
 - Support for multi-server installations (store keys in sql database?)

--
Gitblit v1.9.1