aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-16 12:28:21 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-16 12:28:21 +0100
commit84b2ce10b7a38aaaa9d2d3ee8ad4e1213402640f (patch)
tree9fb75476bd57dfb964ea4e9cf422385a7e21cc1f /src/main/res/values
parentd43aeb721835e43a15e3496b3c06dda54d516d76 (diff)
parent2c6547753275a5c988ae4b6a4f15993700c736a6 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/res/values')
0 files changed, 0 insertions, 0 deletions