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
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
silences_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
suspensions_controller.rb	…
tags_controller.rb	…
two_factor_authentications_controller.rb	…