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 f9ef1160ca Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2015-03-24 15:29:58 +01:00
..
src/main
Merge branch 'development' into linked-identities
2015-03-24 15:29:58 +01:00
.gitignore
…
build.gradle
Merge branch 'development' into linked-identities
2015-03-24 15:29:58 +01:00