diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-13 17:11:36 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-13 17:11:36 +0200 |
commit | f1bdf1d4c51d1e15149b1aae80541c0efef93c48 (patch) | |
tree | 86b27c9a137ccfbcaadc846969c53b2c744fd6e5 /res/values-ca | |
parent | 9492e2890208ed8527504d692cfdb07d36d2fa30 (diff) | |
parent | 71545f4f665cd4fea6e6ecc1824ffac1f454bce2 (diff) |
Merge branch 'development' into feature/take_picture
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions