diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-29 10:09:48 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-29 10:09:48 +0200 |
| commit | 04ceeec4b302a23f14d73e4d6e479ebf28145c8e (patch) | |
| tree | fb537bca00a09b672fb1449f58c7d31b4dc9da60 /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
| parent | 35bf89e154ed7ac26e538fb908a96fc99e9b441d (diff) | |
| parent | 2c55954ddda1d84a32150b430fe80ff8084612a1 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
0 files changed, 0 insertions, 0 deletions