aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-25 19:30:00 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-25 19:30:00 +0100
commit155914470118e0d68f3e042644beadeb7590b666 (patch)
treec62cdc977e984bb245969315fabe7d631277fd3e /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parent14fc520ec086a64739892f3aa8bb1837cbd21471 (diff)
parent29331e49b9fa97949e14f2a326b26c69a4ca3022 (diff)
Merge pull request #933 from betheg/mergeable
fix mergable() for /me command.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
0 files changed, 0 insertions, 0 deletions