diff options
| author | Christian S <christian@pix-art.de> | 2016-04-09 20:46:13 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-09 20:46:13 +0200 |
| commit | 4d4ec6824b6e49b0e241e5b69d49a89003a27f85 (patch) | |
| tree | 3b17e8d73f5b258b406eeae81d70828f16c81aa4 /src/main/java/eu/siacs/conversations/xml | |
| parent | b8ec4663db7fb597ec4a4030ac9ea508e885d9e5 (diff) | |
| parent | 65548ddccb7f63d623a86ad9a740ded87310e313 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xml')
0 files changed, 0 insertions, 0 deletions