diff options
| author | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-20 15:28:01 +0100 |
| commit | fe52f30c5bbd6f4403b1fe97964488611a3c7276 (patch) | |
| tree | 562388d395f2547b85c49d8979dbab6193d08199 /src/main/java/eu/siacs/conversations/xml | |
| parent | 2879ddadca409d05eb71ca0863980ed0ec6b1023 (diff) | |
| parent | 3bde4dbedb80a8e1de89c09f58d842d7382598e8 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xml')
0 files changed, 0 insertions, 0 deletions