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
..
accounts_cli.rb	Fix tootctl accounts rotate not updating public keys (#9556)	2018-12-18 01:22:29 +01:00
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	2018-09-09 13:33:36 +02:00
domains_cli.rb	Improve account suspension speed and completeness (#9290)	2018-12-03 01:32:08 +01:00
emoji_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
feeds_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
media_cli.rb	Fix "tootctl media remove" can't count the file size (#9288)	2018-11-16 09:47:40 +01:00
migration_helpers.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
premailer_webpack_strategy.rb	…
redis_config.rb	…
settings_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	2018-10-27 22:56:16 +02:00
snowflake.rb	…
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-02 20:29:14 +01:00