Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md: kept our version

2019-01-28 21:14:47 +01:00

..

accounts_cli.rb

Fix tootctl accounts delete not deleting user record as well (#9874)

2019-01-20 12:30:25 +01:00

cli_helper.rb

…

domains_cli.rb

Fix tootctl domains crawl with JSON format output crash (#9820)

2019-01-16 15:47:55 +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

Fix SUPERUSER postgres command (#9877)

2019-01-27 23:56:07 +01: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

2019-01-28 21:14:47 +01:00