aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubStep1Fragment.java
Commit message (Collapse)AuthorAgeFilesLines
* linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-091-6/+2
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-4/+4
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* support github resource (re)Vincent Breitmoser2015-03-241-0/+129