| commit | c293b92386617399021f7ddfbf745ac9307c99e9 | |
| author | intrigeri <intrigeri@boum.org> | |
| Mon, 14 Jan 2019 19:54:18 +0000 (14 19:54 +0000) | ||
| committer | intrigeri <intrigeri@boum.org> | |
| Mon, 14 Jan 2019 19:54:18 +0000 (14 19:54 +0000) | ||
| tree | 06afe118718d0ccdbf9c9a31453ae1c4db35479a | treesnapshot (tar.gz zip) |
| parent | 4b4a772d9a84c4db56475592f1fb16c161eeb9d2 | commitdiff |
| parent | 0f9fe722e0be02f777dfaa4d5dffcc4799f75b6b | commitdiff |
Merge branch 'hefee/bugfix/16186-disable-autocrypt+force-all-tests' into devel (Fix-committed: #15657, #15661, #16222)
Note: this branch actually does _not_ do anything special wrt. Autocrypt,
nor does it address #16186 (if there's anything to address there, which
is unclear at the moment).
Note: this branch actually does _not_ do anything special wrt. Autocrypt,
nor does it address #16186 (if there's anything to address there, which
is unclear at the moment).