aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-1/+1
* Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-5/+1
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-17/+75
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-72/+187
* Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-211-1/+2
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-2/+8
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-2/+14
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-0/+770