diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-04 22:56:36 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-04 22:56:36 +0100 |
| commit | 7d4e03cc9a80c00eddc47fece8147fbaef52f536 (patch) | |
| tree | d24eea8186eea60eb943ab422b4f9fed2bfc8a79 /src/main/java/eu/siacs/conversations/entities | |
| parent | 88c07936940353128dc7d446a9f14dbfbc3ce7c9 (diff) | |
| parent | 39183418ab133f14bddc389dea8419980538f629 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
0 files changed, 0 insertions, 0 deletions