diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:52:11 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:52:11 +0100 |
| commit | a643da6ff368c56186a92b135988d52d5f0bff63 (patch) | |
| tree | 87ba3d12270cb08137f169ad84a50ee7745832eb /app/assets/calyx.net.pem | |
| parent | 03c1d39eccca1368fb160d6495f385846def5818 (diff) | |
| parent | 6a683c605aa5bb5ce72f8ea46a4b6bcae0f9e98a (diff) | |
Merge branch '8868_ui_lollipop' into 0xacab_0.9.8
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53
Diffstat (limited to 'app/assets/calyx.net.pem')
0 files changed, 0 insertions, 0 deletions