This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.		2018-10-30 17:52:08 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
flavours	Add a local setting for inline preview cards	2018-10-30 17:51:06 +01:00
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 17:52:08 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 11:22:25 +01:00