diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-03 13:09:05 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-03 13:09:05 +0200 |
| commit | 1c86098f3b4360eae76f39359281dbdf88321d9f (patch) | |
| tree | 95d325b6d440368d815945d08c55e966f9f1798e /src/main/res/values | |
| parent | c745fbb562b6f25cb57a06538b4c54fdfe619fa3 (diff) | |
| parent | bfe1d2489ae41f21c2899c6eea4273357a6aa20b (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/main/res/values')
0 files changed, 0 insertions, 0 deletions