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-Test
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/test
Merge branch 'development' into linked-identities
2015-03-15 20:02:57 +01:00
build.gradle
Use fixed version of com.squareup:fest-android, enable offline builds
2015-03-15 14:57:37 +01:00