djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 18:40:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
b867d4581e
tootlab-mastodon/app/views/shared
History
Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +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 Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
_web_app.html.haml Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 2023-07-30 13:42:06 +02:00