moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-19 05:42:17 -05:00
Code Issues Releases Wiki Activity
ca4774fd62
open-keychain/OpenKeychain/src/main/java
History
Vincent Breitmoser ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
2014-06-13 00:27:40 +02:00
..
android/support/v4/widget Add license header to FixedDrawerLayout 2014-05-18 23:23:58 +02:00
org/sufficientlysecure/keychain Merge remote-tracking branch 'origin/master' into canonicalize 2014-06-13 00:27:40 +02:00