diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:51:14 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:51:14 +0100 |
commit | 03c1d39eccca1368fb160d6495f385846def5818 (patch) | |
tree | 658795aa32a83a1d31707f83712f249aba453c10 /app/src/test/resources/preconfigured/calyx.net.pem | |
parent | 241b1c4491d2534bb0f79af21ba180b9b3d99446 (diff) | |
parent | cf10c3dc481b154cd8f4d6996c9a80643b67c840 (diff) |
Merge branch '8851_remove_menu' into 0xacab_0.9.8
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/49
Diffstat (limited to 'app/src/test/resources/preconfigured/calyx.net.pem')
0 files changed, 0 insertions, 0 deletions