mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 15:15:08 +01:00
034ffc079e
Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb | ||
push_controller_spec.rb | ||
salmon_controller_spec.rb | ||
subscriptions_controller_spec.rb |