aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
Commit message (Collapse)AuthorAgeFilesLines
* use final fragment superclass for twitterVincent Breitmoser2015-03-061-98/+23
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-3/+3
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
* some fixes for compiling (still not working!)Vincent Breitmoser2015-03-021-3/+3
|
* affirmation -> linked identityVincent Breitmoser2015-01-151-0/+235