moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 05:15:03 -05:00
Code Issues Releases Wiki Activity
91494dd3a3
open-keychain/OpenKeychain
History
Dominik Schürmann 91494dd3a3 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
2015-03-30 15:53:44 +02:00
..
src/main Merge branch 'development' into v/crypto-input-parcel 2015-03-30 15:53:44 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Update build env and plugins 2015-03-23 20:17:30 +01:00