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

…

build.gradle

Update libs

2015-04-14 00:48:45 +02:00