diff options
| author | fupduck <fupduck@riseup.net> | 2018-01-19 08:44:27 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-01-19 08:44:27 -0800 |
| commit | 1393b75a17d1c7a60b9ca72a874535824d63db2d (patch) | |
| tree | 1b7279bd85200b04478f9bfe2933f9075385b703 /app/src/ovpn3/java | |
| parent | 276453c90042eae745681275da25c6894fb6554c (diff) | |
| parent | dbda5fbf23ccad615e932be6b8869fe34a6b440d (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/ovpn3/java')
0 files changed, 0 insertions, 0 deletions