aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-0/+3
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-11/+2
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+12
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-180/+156
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-2/+0
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-0/+530