Dominik Schürmann 23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator ...

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

2015-03-05 23:29:43 +01:00

..

src/main

Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator

2015-03-05 23:29:43 +01:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Update patternview lib, remove workaround

2015-03-03 15:56:03 +01:00