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. |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||