diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-25 11:15:14 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-25 11:15:14 +0200 |
| commit | f5796024567ff8cf605971ef93d23be792229af3 (patch) | |
| tree | 3023e9a64794edf9b0dc3cf4a3096a95e5240dda /src/main/java/eu/siacs/conversations/entities | |
| parent | 9d1a8c607fbd8b784f2cfdc6817938e03b3de093 (diff) | |
| parent | 4cb49c4a9cf8c0bc3f38e6bac849b9dc0d55c63c (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
0 files changed, 0 insertions, 0 deletions