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

Conflicts:
- config/locales/simple_form.pl.yml

2019-01-16 14:20:07 +01:00

..

accounts_cli.rb

Add tootctl accounts follow ACCT (#9414)

2019-01-01 16:24:26 +01:00

cli_helper.rb

tootctl accounts [add|del|cull] (#8642)

2018-09-09 13:33:36 +02:00

domains_cli.rb

Add tootctl domains crawl (#9809)

2019-01-15 09:24:35 +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

2019-01-10 21:00:30 +01:00