diff options
| author | fupduck <fupduck@riseup.net> | 2018-01-11 06:37:01 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-01-11 06:37:01 -0800 |
| commit | 68d6eb91436d0d145fd340056fd8000f7dd1ff34 (patch) | |
| tree | 2f37b74f259915d1b04facd0d0f59856f112f8b8 /app/src/main/assets | |
| parent | 67ff3447f10c43770dc9ee4dccf358321063d131 (diff) | |
| parent | 1e94e6e1403d97e47119318bd43b173ef20658b1 (diff) | |
Merge branch '8773_certificate_pinning' into '0.9.8'
8773 certificate pinning
See merge request leap/bitmask_android!21
Diffstat (limited to 'app/src/main/assets')
| -rw-r--r-- | app/src/main/assets/urls/bitmask demo.url | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/src/main/assets/urls/bitmask demo.url b/app/src/main/assets/urls/bitmask demo.url deleted file mode 100644 index 1a412055..00000000 --- a/app/src/main/assets/urls/bitmask demo.url +++ /dev/null @@ -1,3 +0,0 @@ -{
- "main_url" : "https://demo.bitmask.net/"
-}
|