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

..

assets

…

java

Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development

2015-04-24 03:44:57 +01:00

res

Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into development

2015-04-24 03:44:57 +01:00

AndroidManifest.xml

support for handling keyserver urls from browser, added documentation

2015-04-20 21:42:51 +05:30