diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-20 18:20:45 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-20 18:20:45 +0100 |
| commit | 8b10ea676c01568518fe8c1fe7f7fe34f7d7e9e4 (patch) | |
| tree | a0e15134293982294c062d786f35c97f02a64e53 /src/main/java/eu/siacs/conversations/xmpp | |
| parent | 0ad6d0616f9663814f6f9f24590833425f6ad372 (diff) | |
| parent | 6bb0eb0b982d3bc8e7ed276bbf529601f65f6838 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions