diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-10 23:03:19 +0100 |
| commit | 8585231be2844ab794cfa63454b1013bae8502f6 (patch) | |
| tree | 65126dbebd698c0358b2d499be9e16c3ae8d8f5f /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | 07c2aba59b0ec0fd492621406d08ce33e23ad7ad (diff) | |
| parent | 27c9c0aa21e3ec1a5801f6c3279caf0cd4fe9248 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
0 files changed, 0 insertions, 0 deletions