mastodon

Author	SHA1	Message	Date
Claire	e25cc4deb7	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes.	2023-10-24 19:31:14 +02:00
Claire	379115e601	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439 )	2023-10-23 15:46:21 +00:00
Thibaut Girka	7fd54178d0	glitch-soc theme engine fixes for the challenges controller	2019-09-30 13:37:13 +02:00
Eugen Rochko	e1066cd431	Add password challenge to 2FA settings, e-mail notifications (#11878 ) Fix #3961	2019-09-18 16:37:27 +02:00