Glitch-Shrike/lib/mastodon
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +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
emoji_cli.rb
feeds_cli.rb
media_cli.rb
migration_helpers.rb Fix SUPERUSER postgres command (#9877) 2019-01-27 23:56:07 +01:00
premailer_webpack_strategy.rb
redis_config.rb
search_cli.rb Add `tootctl search deploy` to avoid ugly rake task syntax (#10403) 2019-03-28 02:16:11 +01:00
settings_cli.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
snowflake.rb
statuses_cli.rb Add `tootctl statuses remove` to sweep unreferenced statuses (#10063) 2019-03-11 13:45:17 +01:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-05 19:23:16 +01:00