summaryrefslogtreecommitdiff
path: root/app/src/androidTest/assets
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-01-28 10:17:12 +0100
committercyBerta <cyberta@riseup.net>2018-01-28 10:17:12 +0100
commit298c33b94c8aada449c98a24cdb2c687af40cbbd (patch)
treec27c162be2fff26538eba1d6ba4db67ed5c4fd9a /app/src/androidTest/assets
parent986fe144729b58382641bbf9769a93bf81c06514 (diff)
parent3bb2c2c219359a6016366c4d3533a5e2ef812ea9 (diff)
Merge branch 'origin_0.9.8' into fupduck_8819_config_wizard_design
Diffstat (limited to 'app/src/androidTest/assets')
0 files changed, 0 insertions, 0 deletions