diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-09-15 22:53:06 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-09-15 22:53:06 +0200 |
commit | 4a4ced1e691431d92a45fc9636fb5426aeb8f548 (patch) | |
tree | 564b85d02baedc57491334255e9f57d3aae3fcb9 /src/main/res/values-fr | |
parent | b9002d7fd5455ca2c13934748531b30a97799a9f (diff) | |
parent | 183dad281c6d610b8a4cffa1f13c923a6e423355 (diff) |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions