diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-04-10 11:00:50 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-04-10 11:00:50 +0200 |
| commit | 320f269918fc1cc71eb2b47d4bc7c1a9c19456e0 (patch) | |
| tree | ba6c88d53210a0482974cfb658394ed24f657243 /app/src/androidTest/assets/secrets.json | |
| parent | 91cfa79e99421b5813cea11661ad057d9a75209c (diff) | |
| parent | 45eecc4c3c3380b1f5ec416513ea36144463292d (diff) | |
Merge branch 'develop' into release-0.9.3
Diffstat (limited to 'app/src/androidTest/assets/secrets.json')
0 files changed, 0 insertions, 0 deletions