diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-08-24 17:18:10 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-08-24 17:18:10 +0200 |
| commit | dce001369dd420a4ddc58018c5ba2e692a9e094f (patch) | |
| tree | 1f16cee9ed660d9c432bc001abce26fbe16666b9 /src/eu/siacs/conversations | |
| parent | a30bc8a3e275890b9f39be56c1588aca34188dd4 (diff) | |
| parent | 74f8e655a2024bead50d32c24a05ba23fd8f983a (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