diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-15 23:26:02 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-15 23:26:02 +0200 |
| commit | 38c2f81f181bc3f80cad2931ea67eefa59be0fc3 (patch) | |
| tree | c73b5af4a302e4df9f40086a605bb4fd2528944c /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
| parent | c73425e79a98f99e031d1bfd5f2f79bbd052f74f (diff) | |
| parent | a25912c32cced0683b59bea3095210d76a8d41a6 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
0 files changed, 0 insertions, 0 deletions