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

Browse Source

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

...

This commit is contained in:

tdjogi010@gmail.com 2015-03-13 11:35:05 +05:30

parent d56c90ce76 448797e649

commit da3540805e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available