diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-11 14:28:15 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-11 14:28:15 +0100 |
| commit | 07a5ccf4d789e502a8adcfef1fa2cd49314afb40 (patch) | |
| tree | ae10b3c98cb501917a793038c6b6846af285d897 /src/main/java/eu/siacs | |
| parent | 4d38ba906f040570eb96bdcc9c5d434ec2a99a54 (diff) | |
| parent | 41afd552e98ce54ce6cfd11e9a8841c8aa5a43bc (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions