Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		2019-10-10 17:26:08 +02:00
..
accounts_cli.rb	Remove unused option from tootctl accounts cull (#12074)	2019-10-06 04:30:07 +02:00
cache_cli.rb
cli_helper.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	2019-10-07 05:05:02 +02:00
domains_cli.rb	Change tootctl domains purge to accept multiple domains at once (#12046)	2019-10-02 04:49:53 +02:00
emoji_cli.rb
feeds_cli.rb	Fix tootctl not allocating enough database connections for main thread (#12097)	2019-10-07 05:05:02 +02:00
media_cli.rb	Change tootctl media refresh to skip already downloaded attachments (#12118)	2019-10-08 05:59:10 +02:00
migration_helpers.rb
premailer_webpack_strategy.rb
preview_cards_cli.rb
redis_config.rb
search_cli.rb	Add parallelization to tootctl search deploy (#12051)	2019-10-02 21:50:43 +02:00
settings_cli.rb
snowflake.rb
statuses_cli.rb
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00