aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-16 13:26:12 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-16 13:26:12 +0200
commita31ab555b89739de29bfe8503bd38713c7b42502 (patch)
tree116e439f622df2ec6a282f5305f0d309fad6d0dd /src/main/res
parent7bd66549d87e6c690c115ef3995c4606d0a9415f (diff)
parent43fb216e720ad31cd1c525a1be645bbb28599e5b (diff)
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions