aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-1/+2
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-0/+22
|\
| * Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+22
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-3/+3
|/
* Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-161-0/+72