diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-04-22 12:32:57 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-04-22 12:32:57 +0200 |
| commit | e5e9ac6e43b9cdec0f362711bb33747ab73fc297 (patch) | |
| tree | 8728c5416b29ca4b66438eb64d06f974f0117e37 /app/src/main/res/values/arrays.xml | |
| parent | 467abc3431e2ae148ea72e2c3b4c560473424c3f (diff) | |
| parent | 7d6d55cb62fcdc1e3a36f2634f0399b2d77db263 (diff) | |
Merge branch 'feature/bitmask-for-android-should-pin-some-prooviders-ca's-cert-fingerprint#6877' into develop
Diffstat (limited to 'app/src/main/res/values/arrays.xml')
0 files changed, 0 insertions, 0 deletions