diff options
| author | Christian S <christian@pix-art.de> | 2016-05-04 21:53:29 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-04 21:53:29 +0200 |
| commit | 8a04ca587ab070e482f5836773ad9942584dc26c (patch) | |
| tree | 2581f228d769b431b2678d6b32a908cfaf9e8397 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
| parent | d912fa1fd5a385f5e5febc19116fefeb70b347c3 (diff) | |
merge upstream changes
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions