diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:57:21 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:57:21 +0200 |
| commit | bdc211a67a25298eb05854ff7e98461223e21bc5 (patch) | |
| tree | 9c0f2c97e3a49bfe6ddc2868f0c999b938abeeaa /src/main/java/eu/siacs/conversations/services/AvatarService.java | |
| parent | 01bfe0c59a5bc3eba1db111d3bc687aac9be7847 (diff) | |
| parent | 57cfcefd527195b67b3d96cde921f0f598690946 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/AvatarService.java')
0 files changed, 0 insertions, 0 deletions