| commit | ead8d7bf04e26c038d32da28836811b2e11411f5 | |
| author | intrigeri <intrigeri@boum.org> | |
| Fri, 19 Oct 2018 06:51:29 +0000 (19 06:51 +0000) | ||
| committer | intrigeri <intrigeri@boum.org> | |
| Fri, 19 Oct 2018 06:51:29 +0000 (19 06:51 +0000) | ||
| tree | 62509538e649ebc000e4745032e58182515d20b5 | treesnapshot (tar.gz zip) |
| parent | dd142431c4c4e3026b7ed2565b31706160ef711c | commitdiff |
| parent | 1ba76a14eea74ba30343858496f2105c0c7a1e50 | commitdiff |
Merge branch 'feature/14481-TCRYPT-support-beta' into stable (Fix-committed: #16031, #15967)