This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		2020-12-05 17:33:37 +01:00
..
two_factor	…
new.html.haml	…
sign_in_token.html.haml	…
two_factor.html.haml	…