Merge branch 'ditch-appmsg'

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java

...

This commit is contained in:

Vincent Breitmoser committed 2014-07-29 13:53:18 +02:00

2 parents da131220aa f4ee71e3ef

commit 377d0f09fa

40 files changed

+309 -1005

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

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

No files matched your search

extern/AppMsg

Vendored

-1

Submodule extern/AppMsg deleted from 61e7474190.