summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2015-08-05 22:21:47 +0200
committerAnne Jan Brouwer <annejan@noprotocol.com>2015-08-05 22:21:47 +0200
commit86715701aaabf1e70d027350ca1c7bbefdacc305 (patch)
treee3e0d5df85ed0199e264c5da4378e24e02384f87
parent65bba35e54cb6ba7c9521537e3e19782dd970b92 (diff)
parenta8fa73072b6210f4ed1fe6ec7c7409c26f23fb28 (diff)
Merge branch 'master' into develop
-rw-r--r--FAQ.md16
1 files changed, 14 insertions, 2 deletions
diff --git a/FAQ.md b/FAQ.md
index 454e0d1a..ef321c37 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -16,6 +16,18 @@ use-standard-socket
default-cache-ttl 600
max-cache-ttl 7200
```
+
+Also, the following is useful to add to your .bashrc if you are using Yubikey NEO on Ubuntu:
+
+```
+# OpenPGP applet support for YubiKey NEO
+if [ ! -f /tmp/gpg-agent.env ]; then
+ killall gpg-agent;
+ eval $(gpg-agent --daemon --enable-ssh-support > /tmp/gpg-agent.env);
+fi
+. /tmp/gpg-agent.env
+```
+
* More info: [issue 60](https://github.com/IJHack/qtpass/issues/60) and [issue 73](https://github.com/IJHack/qtpass/issues/73)
### Where can I ask for help?
@@ -36,6 +48,6 @@ max-cache-ttl 7200
* Time:
* Fork, clone hack and send a pull request.
- * Find an [issue](https://github.com/IJHack/qtpass/issues) to work on..
-* Money:
+ * Find an [issue](https://github.com/IJHack/qtpass/issues) to work on..
+* Money:
IJhack takes donations in [bitcoin](https://blockchain.info/address/146dqz8zXn9iNZMv5s7JVqwZKjrmumHBfb)