b0781a933d
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb |