summaryrefslogtreecommitdiff
path: root/app/src/test/resources
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2019-10-06 00:59:31 +0200
committercyBerta <cyberta@riseup.net>2019-10-06 00:59:31 +0200
commit488a804c3060b3abbcbd24e6b832673d0abbb71f (patch)
tree66c7711313f419bcff17643212b4376da2aee5e9 /app/src/test/resources
parent9341f1e405bba7de0ea57a0588ac54ce653ff32f (diff)
fix merge conflict related bug with excluding apps from vpn
Diffstat (limited to 'app/src/test/resources')
0 files changed, 0 insertions, 0 deletions