aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-23 14:31:08 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-23 14:31:08 +0200
commitb6e3ce4b2037b337e4e245411d8b25d61823a6c7 (patch)
tree241f098d81dd5a5a29491293d7824b966fec51d5 /src/eu/siacs/conversations/parser
parent5c118f6dd751905ccab2d9d65f28ec8e210c484a (diff)
parent01a03e5dedf463af624ce5922559c568b1bde4e9 (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/eu/siacs/conversations/parser')
0 files changed, 0 insertions, 0 deletions