aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-02 16:51:05 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-02 16:51:05 +0200
commitc1453db5dfbcd2da23b0cd3b580d357074e75e4d (patch)
tree3340742d048bb8bf36e845ebc9db4d6dfad96e7b /src/eu/siacs/conversations/parser
parent97b52abaf9dc43f643c3925c2c836d752b993dd8 (diff)
parent3235c67e81dfbea51ea3c2b34c2cfd558cd7a820 (diff)
Merge branch 'betheg-unused_resources' into development
Diffstat (limited to 'src/eu/siacs/conversations/parser')
0 files changed, 0 insertions, 0 deletions