diff options
author | kruks23 <scardenas@openmailbox.org> | 2014-07-09 22:05:48 +0200 |
---|---|---|
committer | kruks23 <scardenas@openmailbox.org> | 2014-07-09 22:05:48 +0200 |
commit | c7088489bd339e4b8b5128e909a1b4377864a5c9 (patch) | |
tree | 56974ad74bfdb025a56e817b952221ce4f2dbbe6 /res/values-es | |
parent | 71324261e5560fa70ef028fba35bd121f2527578 (diff) | |
parent | da79e2cca2ffce6e4e5c3b479c4de702ecca1872 (diff) |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions