diff options
author | Parménides GV <parmegv@sdf.org> | 2014-12-16 17:43:14 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-12-16 17:43:14 +0100 |
commit | 31bd970bbc888e5fe21a1396a8365504decf8d7e (patch) | |
tree | aec0a8134aaeb29e75ade251ff17237517065559 /app/src/main/assets/urls | |
parent | 14692f1ad6ae6f6d3b07400c743352e4aed3f23a (diff) | |
parent | dbd6f2c57e4565d4e7a76b4ae2a5520aa877f121 (diff) |
Merge branch 'develop' into release-0.8.1
Diffstat (limited to 'app/src/main/assets/urls')
0 files changed, 0 insertions, 0 deletions