cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
6bacb5ff51f2c284fdc931cb5e82f8310035d8dc
open-keychain/OpenPGP-Keychain/src
History
Vincent Breitmoser 6bacb5ff51 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
2014-03-15 18:34:20 +01:00
..
main
Merge branch 'certify' into certs
2014-03-15 18:34:20 +01:00