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

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

backup_cleanup_scheduler.rb

…

doorkeeper_cleanup_scheduler.rb

…

email_scheduler.rb

…

feed_cleanup_scheduler.rb

…

ip_cleanup_scheduler.rb

Improve IP cleanup query (#11871)

2019-09-17 08:44:25 +02:00

media_cleanup_scheduler.rb

…

pghero_scheduler.rb

…

scheduled_statuses_scheduler.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

subscriptions_cleanup_scheduler.rb

Remove WebSub subscriptions (#11303)

2019-07-21 04:08:00 +02:00

subscriptions_scheduler.rb

Remove Salmon and PubSubHubbub (#11205)

2019-07-06 23:26:16 +02:00

trending_tags_scheduler.rb

Change trending hashtags to not disappear instantly after midnight (#11712)

2019-09-02 18:11:13 +02:00

user_cleanup_scheduler.rb

…