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
..
src/main	Merge branch 'certify' into certs	2014-03-15 18:34:20 +01:00
.gitignore	New Gradle project structure	2014-01-27 14:18:25 +01:00
build.gradle	Lint changes after testing	2014-03-10 14:59:15 -04:00