diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:39 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-12-02 23:02:39 +0100 |
| commit | b405ba71067818ede536a9a0de5a2536ff4f3b52 (patch) | |
| tree | 67ac03561c1100a8c8bc0d702569fdc6e1bc0701 /src/main/java/eu/siacs/conversations/ui | |
| parent | a0dcdf5c762ff28edeea34c2cfe654c31889abc7 (diff) | |
| parent | 6fdc38911c47ea4bd57d3706c9987e59af21fd90 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
0 files changed, 0 insertions, 0 deletions