diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-03-20 22:40:06 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-03-20 22:40:06 +0100 |
| commit | 825278971e869012e71dedbbd0da2792c3182157 (patch) | |
| tree | c96832abfdf67574d4418041c7721502d1156816 /src/main/java/eu/siacs | |
| parent | da099e5fa451587a0dba92179a4462c91c02c12d (diff) | |
| parent | 30e2dee456081a7355e411762ef8aa6a19c8f113 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions