diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-15 19:32:23 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-15 19:32:23 +0200 |
| commit | 89cc4d12477e4c5593d10b69e0ed42cbaedfb190 (patch) | |
| tree | 225317ab27825634d82b93c4a23f540471083b87 /src/eu/siacs/conversations/xmpp | |
| parent | cb4069f0f213ed1a38ce074d981b0c367dc2cdfd (diff) | |
| parent | 4c9ac61349cbfbe0e599f39505f4058ef06297de (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions