aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser/MessageParser.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-03 15:50:32 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-03 15:50:32 +0200
commit657df841551cecc8ade139c6313fdee6b4d01ebd (patch)
treeb49a6abfe28cea9975385eb54fa05ed612dad70f /src/eu/siacs/conversations/parser/MessageParser.java
parent41dde747c2b9cfe24469dee3ce888cfe20071476 (diff)
parentcedc1f40b37aaecfef60f0bf63d30d24fa280e82 (diff)
Merge branch 'feature/xep-0333' into development
Diffstat (limited to 'src/eu/siacs/conversations/parser/MessageParser.java')
0 files changed, 0 insertions, 0 deletions