aboutsummaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-05-09 20:57:08 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-05-09 20:57:08 +0200
commitf0eb80eb5cdf1b61b6c6d00d436d86650b8b3b43 (patch)
tree46177630f39f7af7a526499ac198fb47a5ce0423 /res/xml
parentb6fa18a5952d4eb9c1764165ffa4091e7c57aa32 (diff)
parent95504f5505a39f50901c2951ba6fcefc67a8825e (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/xml')
0 files changed, 0 insertions, 0 deletions