diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-20 23:03:03 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-20 23:03:03 +0200 |
| commit | 4291039dbc277d295956cbeb734d8c8296cd6404 (patch) | |
| tree | d04fc29b34c6c56c563670466ed72e0815beb42b /src/main/java/eu/siacs/conversations | |
| parent | d3728e504f9673e97536d9bd519097c3df961035 (diff) | |
| parent | 301b647f1eea3d8014839787f5d6585dd8b303ec (diff) | |
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
0 files changed, 0 insertions, 0 deletions