diff options
| author | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
| commit | eb829eb307b69989ae4efdcb23cf2d8a28979b33 (patch) | |
| tree | 18d56593e47e1db1e7775c2e7b35ed0325e68ed6 /src/main/java/eu/siacs/conversations/xmpp/forms | |
| parent | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff) | |
| parent | 183dad281c6d610b8a4cffa1f13c923a6e423355 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/forms')
0 files changed, 0 insertions, 0 deletions