summaryrefslogtreecommitdiff
path: root/app/src/androidTest
diff options
context:
space:
mode:
authorfupduck <fupduck@riseup.net>2018-01-19 08:44:27 -0800
committerfupduck <fupduck@riseup.net>2018-01-19 08:44:27 -0800
commit1393b75a17d1c7a60b9ca72a874535824d63db2d (patch)
tree1b7279bd85200b04478f9bfe2933f9075385b703 /app/src/androidTest
parent276453c90042eae745681275da25c6894fb6554c (diff)
parentdbda5fbf23ccad615e932be6b8869fe34a6b440d (diff)
Merge branch '0.9.8' into '8811_rename_vpn_to_provider_name'
# Conflicts: # app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
Diffstat (limited to 'app/src/androidTest')
0 files changed, 0 insertions, 0 deletions