merge: contrib/keybase

author Richard Russon <rich@flatcap.org>

Wed, 24 Aug 2016 22:57:16 +0000 (23:57 +0100)

committer Richard Russon <rich@flatcap.org>

Wed, 24 Aug 2016 23:01:06 +0000 (00:01 +0100)
author Richard Russon <rich@flatcap.org>
Wed, 24 Aug 2016 22:57:16 +0000 (23:57 +0100)
committer Richard Russon <rich@flatcap.org>
Wed, 24 Aug 2016 23:01:06 +0000 (00:01 +0100)
diff --cc contrib/keybase/decrypt.sh
Simple merge
diff --cc contrib/keybase/install.sh
Simple merge
diff --cc contrib/keybase/muttrc
Simple merge
diff --cc contrib/keybase/pgpdecrypt.sh
Simple merge
diff --cc contrib/keybase/pgpverify.sh
Simple merge
diff --cc contrib/keybase/verify.sh
Simple merge
author	Richard Russon <rich@flatcap.org>
	Wed, 24 Aug 2016 22:57:16 +0000 (23:57 +0100)
committer	Richard Russon <rich@flatcap.org>
	Wed, 24 Aug 2016 23:01:06 +0000 (00:01 +0100)
		1	2
contrib/keybase/decrypt.sh	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/keybase/install.sh	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/keybase/muttrc	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/keybase/pgpdecrypt.sh	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/keybase/pgpverify.sh	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/keybase/verify.sh	patch \|	diff1 \|	diff2 \|	blob \| history