diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-14 19:49:49 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-14 19:49:49 +0100 |
| commit | 793671023bd2d05e56ebb5de7ae8a49db7364ffb (patch) | |
| tree | c137778d4c11347fe3a390a50dbeb3dc2e5b6f69 /src/main/java/eu/siacs/conversations | |
| parent | 3118340ade6c7fc818afb266bcf5394a3d3be365 (diff) | |
| parent | 2bbad26fb05e215194701363bd0e7f18bd16501f (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