diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-05-17 13:04:33 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-05-17 13:04:33 +0200 |
| commit | 813896dbc9229c29b09798a296553a7d8caf07c6 (patch) | |
| tree | 0e3e4b070d1ee480ad916d6d926ff24342a3f908 /res/values | |
| parent | 9b95b07b97c8c51bc0388059704a503e0b11a0d3 (diff) | |
| parent | e34fddd7e1aa26da75b5ad61a4af7504c1db497c (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/values')
0 files changed, 0 insertions, 0 deletions