mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 05:43:40 +01:00
7782e4dc0d
Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes. |
||
---|---|---|
.. | ||
challenges_controller.rb | ||
confirmations_controller.rb | ||
omniauth_callbacks_controller.rb | ||
passwords_controller.rb | ||
registrations_controller.rb | ||
sessions_controller.rb | ||
setup_controller.rb |