aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/join_conference_dialog.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-4/+4
* Make conversations the root projectSam Whited2014-10-221-0/+47