moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 06:12:20 -05:00
Code Issues Releases Wiki Activity
open-keychain/OpenKeychain
History
Vincent Breitmoser 4afd6b881e Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
2015-03-15 20:02:57 +01:00
..
src/main
Merge branch 'development' into linked-identities
2015-03-15 20:02:57 +01:00
.gitignore
Fix gitignore for lint
2014-04-09 16:36:28 +02:00
build.gradle
rearrange linked id layouts, add CertListWidget
2015-03-09 21:27:32 +01:00