aboutsummaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-14 11:48:01 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-14 11:48:01 +0200
commit3fa3d5f02ba954d87179c64cd75bd2ae7a749770 (patch)
tree60c9f5d1a2de1507041a3876cb797fec3d25a4fa /res/xml
parente2f886d121826df2a97d9f71bc7feab9f6dd52c2 (diff)
parent4c99d9e24289b383f632aa72742482bee11a38bb (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/xml')
0 files changed, 0 insertions, 0 deletions