summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-04-25 13:38:39 +0200
committeranonym <anonym@riseup.net>2016-04-25 13:38:39 +0200
commitf54f8f935d2465256fe1f153c4248533d8250db8 (patch)
tree58baa4ae0ca3d2b72c82ae990bf0d054b3eb33dc /config/chroot_local-includes
parent5f698c06d8e1ac0656df586e45a9450898372fa5 (diff)
parentb3fb961854d706491b6b7c1409358033144f555c (diff)
Merge remote-tracking branch 'segfault/bugfix/11038-pinentry-no-global-grab' into stable
Fix-committed: #11038
Diffstat (limited to 'config/chroot_local-includes')
-rw-r--r--config/chroot_local-includes/etc/skel/.gnupg/gpg-agent.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/chroot_local-includes/etc/skel/.gnupg/gpg-agent.conf b/config/chroot_local-includes/etc/skel/.gnupg/gpg-agent.conf
new file mode 100644
index 0000000..2ecba94
--- /dev/null
+++ b/config/chroot_local-includes/etc/skel/.gnupg/gpg-agent.conf
@@ -0,0 +1 @@
+no-grab