diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:27 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:27 +0200 |
| commit | 1cfe557b2b7035c3b7df26948b82a11dff141e77 (patch) | |
| tree | a3e9f2f85db66d61c3508fd3a1cafea50854224d /src/eu/siacs/conversations | |
| parent | c65600edc9861c5f1788676e03a8164904a79193 (diff) | |
| parent | 2f514381a22edd8c26c0b15f822c032edc1702df (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions