aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/fragment_conversation.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-4/+6
|\
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-041-4/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-1/+1
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-041-1/+1
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-0/+8
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-8/+8
| |\
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-2/+2
* | | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-121-0/+8
| |/ |/|
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-8/+8
|/
* whatsapp-like smiley implementationlookshe2015-04-121-1/+10
* Make conversations the root projectSam Whited2014-10-221-0/+102