diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /OpenKeychain/src/main/res/raw-uk | |
parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/raw-uk')
-rw-r--r-- | OpenKeychain/src/main/res/raw-uk/help_changelog.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html index f18b7917b..65842f6cc 100644 --- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html +++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html @@ -1,7 +1,12 @@ <html> <head></head> <body> -<h2>2.10</h2> +<h2>2.9.2</h2> +<ul> +<li>Fix keys broken in 2.9.1</li> +<li>Yubikey decryption now working via API</li> +</ul> +<h2>2.9.1</h2> <ul> <li>Split encrypt screen into two</li> <li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li> |