aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-01-22 10:41:45 +0100
committerGitHub <noreply@github.com>2017-01-22 10:41:45 +0100
commit2f4eee1fa7985cfcde0d29336705d3978dedb778 (patch)
tree018becce5c4eec4a8d214ad9bff5ca2d55fbceb8 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parent97ba0a0d49dbd3eafb8b7db07a636e107400332d (diff)
parent313baca84ea6a630d479424d3052011a8f17ae7f (diff)
Merge pull request #2230 from AnBuKu/patch-1
Added XEP-0384
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
0 files changed, 0 insertions, 0 deletions