diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-24 13:29:39 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-24 13:29:39 +0200 |
| commit | 1dae59141d345ae023ce94679f087f92b8b999d2 (patch) | |
| tree | 99a3c3303c902f88004805397a62b2c3262156a6 /src/eu/siacs | |
| parent | cbc3d9bd6f275984b390eb4dae48f8eed669fe7a (diff) | |
| parent | 581e96349c73780f4e298a58686575addb357b76 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs')
0 files changed, 0 insertions, 0 deletions