diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-30 21:46:08 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-30 21:46:08 +0200 |
| commit | 2cdc31a6887f242dfe4faca91af63ffd4e74ef67 (patch) | |
| tree | 0da6af359234c6faaa6a4efa25fccd9da701d501 /src/main/java/eu/siacs/conversations | |
| parent | b23bce35e7b79b9dc6bb45238610c2d347ab0fe7 (diff) | |
| parent | ff3cd0ea4640637ec242b75dc4bd855b1f983b24 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions