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/extern
History
Dominik Schürmann 040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
2015-03-24 13:19:43 +01:00
..
html-textview @ 9872a73156
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
KeybaseLib @ 9615d90b18
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
minidns @ 969ffd2951
Update mini dns lib
2015-01-30 10:10:55 +01:00
openkeychain-api-lib @ 9259075028
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
openpgp-api-lib @ 9abb91d3a6
Updated openpgp-api-lib
2015-03-22 08:16:24 +05:30
safeslinger-exchange @ 7c84cb54df
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
snackbar @ 97cda0806d
translation fixes
2015-03-23 22:38:20 +01:00
spongycastle @ 2c744ebade
forgot spongycastle update
2015-03-22 07:33:41 +01:00
StickyListHeaders @ 70a2ed8063
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00
TokenAutoComplete @ 1d6d3882e7
Use SDK and build tools versions from root project
2015-03-02 16:21:51 +01:00