Vincent Breitmoser e6af789bf5 Merge branch 'development' into linked-identities ...

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

2015-03-02 18:34:51 +01:00

..

src/main

Merge branch 'development' into linked-identities

2015-03-02 18:34:51 +01:00

.gitignore

Fix gitignore for lint

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

build.gradle

Use gradle witness

2015-03-02 17:23:06 +01:00