diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-08-14 22:10:03 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-08-14 22:10:03 +0200 |
commit | 8358a513f0ec45e2398fd0a43650264751f7119f (patch) | |
tree | 64d6b3b621844fe1515eb619e76507365bdfb406 /src/eu/siacs/conversations/parser | |
parent | 48c780d15ac298094be342a2292f6743fac80495 (diff) | |
parent | c6b7e3a34eef17da8c0e3d5ae97eb96bf259bbf7 (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