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.

Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		2021-10-14 21:44:57 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
flavours	[Glitch] Add single option votes tooltip in polls	2021-10-13 15:53:33 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
packs	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00