aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/MucOptions.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-01 12:33:03 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-01 12:33:03 +0100
commitd1fc90f9810832d812c3cf5525c9a5ce27619bdd (patch)
treed9e14769dff7939ce33f07d0e633ff4e212e9ad1 /src/main/java/eu/siacs/conversations/entities/MucOptions.java
parent336daea875a6aa864df77b121843aea2e1892d2f (diff)
parent19c2ca520c703576bfbf68626051fe5faab6362f (diff)
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
0 files changed, 0 insertions, 0 deletions