summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-18 13:24:07 +0100
committercyBerta <cyberta@riseup.net>2018-02-18 13:24:07 +0100
commitbe6b775a7fdb1b8c194bea75ae8f923d9c1b0349 (patch)
treec4c0b41bbe878187fb1344cb3978e097c620b8b4 /.gitignore
parent732e1f23d1e00f28ea5e64869737ba2c34e1791e (diff)
parentff319e7862b5b6e1592811aa8c6571c7b9a1631c (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 '.gitignore')
0 files changed, 0 insertions, 0 deletions