moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-31 23:20:20 -05:00
Code Issues Releases Wiki Activity
8132b9ac74
open-keychain/OpenKeychain
History
Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2014-07-26 23:06:32 +02:00
..
src/main Merge branch 'master' into ditch-appmsg 2014-07-26 23:06:32 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Merge branch 'master' into ditch-appmsg 2014-07-26 23:06:32 +02:00