cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
5f20b8de1a052d366e5dcb24f2539062ae903156
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure
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
..
keychain
Merge branch 'new-edit'
2014-06-18 21:09:04 +02:00