diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-04-07 15:36:16 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-04-07 15:36:16 +0200 |
| commit | 36f3bed2eccb3dfd5266304c482497eff0d25c7c (patch) | |
| tree | a43598541a1a4ea92142d17e02c02033e49fa8a3 /src/main/res/layout/activity_start_conversation.xml | |
| parent | 4ace80d39ade18934d310ba37559c9c7ec8004dd (diff) | |
| parent | 8c3245dd1f257053b8ec2bf7c5e03a3a98b282c3 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
Diffstat (limited to 'src/main/res/layout/activity_start_conversation.xml')
0 files changed, 0 insertions, 0 deletions