diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-03 20:28:58 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-03 20:28:58 +0100 |
| commit | c48407f3b4c5b2984fcdc33d9fce7a55ea0e94b9 (patch) | |
| tree | 67796bf64e4bf2236fb3422d78d5513214a0f234 /src/main/java/eu/siacs/conversations | |
| parent | ec9c264cf757f0dd78991f72ebf54164bad12995 (diff) | |
| parent | e496a5409bac5a5090ceda51fe8c09493b010f15 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions