aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvUserIdsFragment.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-2/+2
|\
| * Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED inst...Dominik Schürmann2015-03-041-2/+2
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-1/+1
|/
* Reorder advanced key viewDominik Schürmann2015-02-271-0/+184