diff options
author | Parménides GV <parmegv@sdf.org> | 2014-08-19 19:56:05 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-08-19 19:56:05 +0200 |
commit | 0a3900e145866c2f5b0adbd8c9c3fac2fb56efcb (patch) | |
tree | 3bf700160365b6c1a2b61c3861fb64450d4f344c /app/src/main/res | |
parent | 8083a343053fd8f332ab5e9d32528715b8edbb9f (diff) | |
parent | fad9af561c6086f102c9902e8db8c12df5648bb1 (diff) |
Merge branch 'develop'0.6.0
Diffstat (limited to 'app/src/main/res')
0 files changed, 0 insertions, 0 deletions