Vincent Breitmoser 377d0f09fa Merge branch 'ditch-appmsg' ...

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

2014-07-29 13:53:18 +02:00

..

src/main

Merge branch 'ditch-appmsg'

2014-07-29 13:53:18 +02:00

.gitignore

Fix gitignore for lint

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

build.gradle

Merge branch 'master' into ditch-appmsg

2014-07-26 23:06:32 +02:00