diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-15 17:16:49 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-15 17:16:49 +0100 |
| commit | 25d8546ae89da97e975e72e9eb2f0608fb38aad5 (patch) | |
| tree | 2dffd319c33c95a4ee33bb884f1a1a5407c0173e /src/main/res/layout/activity_verify_otr.xml | |
| parent | 2bd4621245dfcf1a64f68e1c3d1ae82e44cbe4b9 (diff) | |
| parent | a6d4b0aec5ab5d8df887e7e0aefaaeef7c42a8b9 (diff) | |
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
Diffstat (limited to 'src/main/res/layout/activity_verify_otr.xml')
0 files changed, 0 insertions, 0 deletions