Merge branch '19376-fix-activation-in-inconsistent-state' into 'stable'
commit2c98b96155b5364101e1a4739bd15e0ec8d44101
authorboyska <boyska@riseup.net>
Wed, 29 Mar 2023 08:42:22 +0000 (29 08:42 +0000)
committerboyska <boyska@riseup.net>
Wed, 29 Mar 2023 08:42:22 +0000 (29 08:42 +0000)
treec25e63298f633e31b7cc5ec0d8adb549ff699cfd
parent190741991664a05a7ff8c594b1e963bf81197180
parente7c21f56441a7ab760611bcd443be373dcac82ff
Merge branch '19376-fix-activation-in-inconsistent-state' into 'stable'

tps: Fix activation of feature in inconsistent state

Closes #19368, #19331, #8447, #19291, and #19376

See merge request tails/tails!1010
config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py
config/chroot_local-includes/usr/lib/python3/dist-packages/tps/service.py