diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:40:45 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:40:45 +0200 |
| commit | 5f8de512f5d14515146d341bc3e0ae0e066837b8 (patch) | |
| tree | 87f6b90d606db834f2503549b4c82f18bae1a376 /src/main/java/eu/siacs/conversations/entities | |
| parent | c23642b8cd2c06c5f3e9cf7f88d31ed5c6f78614 (diff) | |
| parent | 9e724edb42d8cb0fa8745f88a80d914df09f4ff6 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/new_version'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
0 files changed, 0 insertions, 0 deletions