mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
---|---|---|
.. | ||
_tag.html.haml | ||
index.html.haml | ||
show.html.haml |