mastodon

Author	SHA1	Message	Date
Claire	7635c67450	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change.	2023-07-30 13:42:06 +02:00
Renaud Chaput	42698b4c5c	Fix the crossorigin attribute (#26096 )	2023-07-21 11:14:26 +02:00
Claire	d9adda1a99	Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream	2023-07-13 22:40:15 +02:00
Stanislas Signoud	5fad7bd58a	Change links in multi-column mode so tabs are open in single-column mode (#25893 )	2023-07-13 17:18:09 +02:00
Claire	cb19be67d1	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
Eugen Rochko	62782babd0	Change public statuses pages to mount the web UI (#19301 )	2022-10-06 02:26:34 +02:00