diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-05-28 10:38:12 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-05-28 10:38:12 +0200 |
| commit | f4ce5082b9743743b8d2623401898ce9516acbd4 (patch) | |
| tree | cb535f314d5a88b4bfe92bd7a6a813be0ef8d3d3 /src/eu/siacs/conversations | |
| parent | e348afac5485d349b27561e797a1892a73cf023b (diff) | |
| parent | 3e3967b785707c46a7445c758a22b1869f9c6b89 (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