aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-3/+2
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-0/+446