You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
accounts_cli.rb	…
cli_helper.rb	…
domains_cli.rb	…
emoji_cli.rb	…
feeds_cli.rb	…
media_cli.rb	…
migration_helpers.rb	…
premailer_webpack_strategy.rb	…
redis_config.rb	…
settings_cli.rb	…
snowflake.rb	…
version.rb	…