diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:50:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-15 15:50:35 +0100 |
| commit | 5b9c690c47cbb6fd352d7ddce3b13e6bf119fc22 (patch) | |
| tree | d6f19365a8a72d1f711e3d4055d354d16fe5bcaf /src/main/res/layout/fragment_conversation.xml | |
| parent | 4c504dea7ac7b0413df89ec630408b91f4abddb4 (diff) | |
| parent | f1e2be4096d1c023adc2c9eec49bcf64b9a453de (diff) | |
Merge branch 'feature/otr_verification' into development
Diffstat (limited to 'src/main/res/layout/fragment_conversation.xml')
0 files changed, 0 insertions, 0 deletions