diff options
| author | Christian S <christian@pix-art.de> | 2016-03-17 20:26:23 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-17 20:26:23 +0100 |
| commit | 5ae161a593e651df09556659e129d22579548e6b (patch) | |
| tree | 860883b1e4f8adde36f7ae4b52155f4bc9bdba87 /src/main/java/eu/siacs/conversations/xmpp | |
| parent | 92a9299a38fdb2861ec3544950e47dd9d9e82e0a (diff) | |
| parent | c4b1f6171d2bf82e44a3ba567f7732cc8beef717 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions