Dominik Schürmann 520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java

2015-05-04 14:42:21 +02:00

..

src

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

2015-05-04 14:42:21 +02:00

.gitignore

…

build.gradle

Temporary fix for gradle dependency bug

2015-05-04 14:29:47 +02:00