diff options
| author | lookshe <github@lookshe.org> | 2016-03-15 09:18:03 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-15 09:18:03 +0100 |
| commit | 25d3aba4d7dad3edffb92a06b2b018df7ca9b177 (patch) | |
| tree | 6a3c388c6b17f000472bdf683fa3907f59952d46 /src/main/java/eu/siacs/conversations/entities/Blockable.java | |
| parent | 340272ba841be12dcdf1317e183a45d8b46dce44 (diff) | |
| parent | 76a1937745ed0281e817722ab0ce159546397b3c (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Blockable.java')
0 files changed, 0 insertions, 0 deletions