diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-22 13:08:44 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2017-01-22 13:08:44 +0100 |
| commit | 7035f38e0be568e508a76dee1b791aeaa609305c (patch) | |
| tree | e32c6a927c7fe1215818ef034691953b9317e8cc /src/main/res | |
| parent | d53c813408a7db2efad5ada94fc08e940fe9f528 (diff) | |
| parent | 2f4eee1fa7985cfcde0d29336705d3978dedb778 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions