moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-17 07:30:14 -05:00
Code Issues Releases Wiki Activity
d4c1b781db
open-keychain/OpenKeychain/src/main
History
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
..
assets remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
java Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
res Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
AndroidManifest.xml Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00