diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 17:57:22 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 17:57:22 +0100 |
| commit | 1d9a840c0bd84804840ffd03a595c70b880b6d1d (patch) | |
| tree | be2ffa2c539ca5cb58073a0143ef23983c90b34c /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
| parent | a8db6be4eb932bfa54efb0bf50266c4167a32004 (diff) | |
| parent | 9bcacdb8b9eb0321d68e03d088241b722710a465 (diff) | |
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
0 files changed, 0 insertions, 0 deletions