diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-06 11:39:33 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-06 11:39:33 +0200 |
| commit | e820c98cb7745e41ac23a8ce69a7a6149c92351a (patch) | |
| tree | 1cce6e14b52360d943aad0f5165467c31f27bea2 /src/eu/siacs/conversations | |
| parent | 5fe926b64586f5ac7d3eba7a64de81a710437a14 (diff) | |
| parent | 356a5724f60df03883ce25922d4aec700d35de7a (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