mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-27 11:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/shared
History
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
..
_error_messages.html.haml Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
_og.html.haml Do not strip tags from Setting.site_short_description (#23975) 2023-03-06 15:37:19 +01:00
_web_app.html.haml Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 2023-07-30 13:42:06 +02:00