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/assets/urls | |
| 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/assets/urls')
| -rw-r--r-- | app/assets/urls/calyx.net.url (renamed from app/assets/urls/calyx.url) | 0 | ||||
| -rw-r--r-- | app/assets/urls/demo.bitmask.net.url (renamed from app/assets/urls/bitmask demo.url) | 0 | ||||
| -rw-r--r-- | app/assets/urls/riseup.net.url (renamed from app/assets/urls/riseup.url) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.net.url index 8de04fe9..8de04fe9 100644 --- a/app/assets/urls/calyx.url +++ b/app/assets/urls/calyx.net.url diff --git a/app/assets/urls/bitmask demo.url b/app/assets/urls/demo.bitmask.net.url index 1a412055..1a412055 100644 --- a/app/assets/urls/bitmask demo.url +++ b/app/assets/urls/demo.bitmask.net.url diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.net.url index 4548b433..4548b433 100644 --- a/app/assets/urls/riseup.url +++ b/app/assets/urls/riseup.net.url |