moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-11 01:42:16 -05:00
Code Issues Releases Wiki Activity
9ef2795fcd
open-keychain/OpenKeychain/src/main
History
Vincent Breitmoser 9ef2795fcd Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-03-21 15:57:35 +01:00
..
assets remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
java Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel 2015-03-21 15:57:35 +01:00
res Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel 2015-03-21 15:57:35 +01:00
AndroidManifest.xml Merge remote-tracking branch 'origin/development' into development 2015-03-20 14:01:07 +01:00