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 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		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	Do not remove "dead" domains in tootctl accounts cull (#9108)	6 years ago
feeds_cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	6 years ago
media_cli.rb	Fix "tootctl media remove" can't count the file size (#9288)	6 years ago
migration_helpers.rb	Fix SUPERUSER postgres command (#9877)	6 years ago
premailer_webpack_strategy.rb	…
redis_config.rb	…
settings_cli.rb	Admission-based registrations mode (#10250)	6 years ago
snowflake.rb	…
statuses_cli.rb	Add `tootctl statuses remove` to sweep unreferenced statuses (#10063)	6 years ago
version.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago