aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils/ConversationUtil.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-2/+5
|\
| * Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-291-2/+5
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-091-5/+7
|/
* XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-091-0/+75