diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-22 18:58:38 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-22 18:58:38 +0200 |
| commit | eacf56bf37cf37246a40c1cd8df8e507b34501ca (patch) | |
| tree | 217fb96a8b82a03dadcf9daf6e1d4acd74bde49c /src/eu/siacs | |
| parent | 1f4ea552cdfefbb731b8b9848a77445b11abfdd9 (diff) | |
| parent | ce2b96265a46021a63b44460d9bdbbed39de982e (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs')
0 files changed, 0 insertions, 0 deletions