1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
profanity/src/pgp
James Booth 1f90aca503 Merge branch 'master' into plugins-c
Conflicts:
	src/main.c
	src/ui/console.c
2016-02-14 23:00:52 +00:00
..
gpg.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
gpg.h Updated copyright 2016-02-14 22:54:46 +00:00