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.

Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2018-12-18 16:55:15 +01:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
v2	…
web	…
base_controller_spec.rb	…
oembed_controller_spec.rb	…
push_controller_spec.rb	…
salmon_controller_spec.rb	…
subscriptions_controller_spec.rb	…