Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | ||||
| * | Fixes FS#139: Do not merge messages at all | steckbrief | 2016-03-11 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 1 | -0/+22 |
| |\ | |/ |/| | |||||
* | | Compilation errors and merge mixups fixed | steckbrief | 2016-02-11 | 1 | -0/+22 |
| | | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 1 | -3/+3 |
|/ | |||||
* | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵ | steckbrief | 2015-12-16 | 1 | -0/+72 |
distinguishes between image resizing and compressing/saving |