diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:02:49 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:02:49 +0100 |
| commit | e9af0d4ca70dc01e1e7815261c098cf58cfc2fde (patch) | |
| tree | 8d9c6f334f22f5eba19dab187cac3963edcac7b0 /src/main/java/eu/siacs/conversations/entities | |
| parent | ad6fef063ba152d19c1a08590da7996051bcd836 (diff) | |
| parent | 61f046a675978fa53b725e6da18ed27c9f312015 (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
0 files changed, 0 insertions, 0 deletions