cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
38d8f4be52a08ddf738d73500af0288fea80a4b5
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure
History
Vincent Breitmoser 38d8f4be52 Merge remote-tracking branch 'origin/master' into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
	OpenKeychain/src/main/res/values/strings.xml
2015-05-28 23:05:41 +02:00
..
keychain
Merge remote-tracking branch 'origin/master' into development
2015-05-28 23:05:41 +02:00