Files
open-keychain/OpenPGP-Keychain/src/main/res/values
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
..
2014-03-07 00:43:09 +05:30
2014-03-13 20:12:57 +01:00
2014-02-21 01:03:20 +01:00
2014-03-15 18:34:20 +01:00