mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-26 10:04:20 -05:00
b0c76eaadd
Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change. |
||
---|---|---|
.. | ||
activity | ||
adapter_spec.rb | ||
dereferencer_spec.rb | ||
linked_data_signature_spec.rb | ||
tag_manager_spec.rb |