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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		6 years ago
..
accounts_cli.rb	Fix `tootctl accounts delete` not deleting user record as well (#9874)	6 years ago
cli_helper.rb	tootctl accounts [add|del|cull] (#8642)	6 years ago
domains_cli.rb	Fix `tootctl domains crawl` with JSON format output crash (#9820)	6 years ago
emoji_cli.rb	…
feeds_cli.rb	…
media_cli.rb	…
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	6 years ago
premailer_webpack_strategy.rb	…
redis_config.rb	…
settings_cli.rb	…
snowflake.rb	…
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago