moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-07 18:40:19 -05:00
Code Issues Releases Wiki Activity
5f20b8de1a
open-keychain/OpenKeychain/src/main
History
Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
2014-06-18 21:09:04 +02:00
..
assets Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
java Merge branch 'new-edit' 2014-06-18 21:09:04 +02:00
res Merge branch 'new-edit' 2014-06-18 21:09:04 +02:00
AndroidManifest.xml Merge remote-tracking branch 'origin/master' into canonicalize 2014-06-13 00:27:40 +02:00