diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-01-25 19:30:00 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-01-25 19:30:00 +0100 |
commit | 155914470118e0d68f3e042644beadeb7590b666 (patch) | |
tree | c62cdc977e984bb245969315fabe7d631277fd3e /src/main/java/eu/siacs/conversations/http | |
parent | 14fc520ec086a64739892f3aa8bb1837cbd21471 (diff) | |
parent | 29331e49b9fa97949e14f2a326b26c69a4ca3022 (diff) |
Merge pull request #933 from betheg/mergeable
fix mergable() for /me command.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http')
0 files changed, 0 insertions, 0 deletions