moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-03-03 02:42:00 -05:00
Code Issues Releases Wiki Activity
open-keychain/OpenKeychain
History
Dominik Schürmann 34a7728cec Merge branch 'development' into detached-sigs-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
..
src/main
Merge branch 'development' into detached-sigs-api
2015-01-26 16:30:21 +01:00
.gitignore
Fix gitignore for lint
2014-04-09 16:36:28 +02:00
build.gradle
Material Design Drawer
2015-01-26 15:24:42 +01:00