diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-13 17:22:06 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-13 17:22:06 +0200 |
commit | c0f5b26d1ab37f32d8a5b0caf15add3a8718eead (patch) | |
tree | 1bc8638d6179f397f997a09bf4bd553f802e3a83 /src/eu/siacs | |
parent | 71545f4f665cd4fea6e6ecc1824ffac1f454bce2 (diff) | |
parent | efac008ffba38ad43260b1ebbd0c629aa7aeec6d (diff) |
Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development
Diffstat (limited to 'src/eu/siacs')
0 files changed, 0 insertions, 0 deletions