Vincent Breitmoser 531697ffe7 Merge remote-tracking branch 'origin/development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml

2015-03-10 04:56:51 +01:00

..

src/main

Merge remote-tracking branch 'origin/development' into linked-identities

2015-03-10 04:56:51 +01:00

.gitignore

Fix gitignore for lint

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

build.gradle

rearrange linked id layouts, add CertListWidget

2015-03-09 21:27:32 +01:00