diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-29 19:56:36 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-29 19:56:36 +0200 |
| commit | e3b7f9dba9c00d13e5c4658385f9527b7435ef3a (patch) | |
| tree | d7b78311f54fbb7765bb827b3f08be8891c53171 /src/main/java/eu/siacs/conversations/ui | |
| parent | aba7c2ea2f996db05efd8cf9867c3544b2521f2c (diff) | |
| parent | 107ab85a22bda92d7cb1d10ea2494c7280bccf67 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions