diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-02 18:19:26 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-02 18:19:26 +0100 |
| commit | 4a1a59f0c8ce99fd42909fb472179daec5065625 (patch) | |
| tree | c7946ed356111082e1e296a933b30a71f8b25314 /src/main/java/eu/siacs/conversations/parser/MessageParser.java | |
| parent | 01bad127084cdfc623c57be18e123ef8ff6655b0 (diff) | |
| parent | ae84ff2f0c01be832075d16556db2136c1b5ac55 (diff) | |
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/MessageParser.java')
0 files changed, 0 insertions, 0 deletions