diff options
author | cyBerta <cyberta@riseup.net> | 2018-02-18 13:24:07 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-02-18 13:24:07 +0100 |
commit | be6b775a7fdb1b8c194bea75ae8f923d9c1b0349 (patch) | |
tree | c4c0b41bbe878187fb1344cb3978e097c620b8b4 /app/src/main/java/se/leap/bitmaskclient/Constants.java | |
parent | 732e1f23d1e00f28ea5e64869737ba2c34e1791e (diff) | |
parent | ff319e7862b5b6e1592811aa8c6571c7b9a1631c (diff) |
Merge branch 'mirror_0xacab_0.9.8' into #8797_certificate_expiration
* fix merge conflicts in:
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
app/src/main/java/se/leap/bitmaskclient/eip/EipCommand.java
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Constants.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Constants.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Constants.java b/app/src/main/java/se/leap/bitmaskclient/Constants.java index 12b56b93..2b7a8113 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Constants.java +++ b/app/src/main/java/se/leap/bitmaskclient/Constants.java @@ -44,6 +44,7 @@ public interface Constants { String EIP_REQUEST = "EIP.REQUEST"; String EIP_RESTART_ON_BOOT = "EIP.RESTART_ON_BOOT"; String EIP_IS_ALWAYS_ON = "EIP.EIP_IS_ALWAYS_ON"; + String EIP_EARLY_ROUTES = "EIP.EARLY_ROUTES"; ////////////////////////////////////////////// |