moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-14 12:55:08 -05:00
Code Issues Releases Wiki Activity
40122d61cc
open-keychain/OpenKeychain
History
Daniel Ramos 40122d61cc Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
2015-04-24 03:44:57 +01:00
..
src/main Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development 2015-04-24 03:44:57 +01:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Update libs 2015-04-14 00:48:45 +02:00