mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-02-09 21:16:57 +00:00
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
---|---|---|
.. | ||
activitypub | ||
nodeinfo | ||
rest | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |