mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 19:56:56 +00:00
e4f8679eae
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it. |
||
---|---|---|
.. | ||
backup_cleanup_scheduler.rb | ||
doorkeeper_cleanup_scheduler.rb | ||
email_scheduler.rb | ||
feed_cleanup_scheduler.rb | ||
instance_refresh_scheduler.rb | ||
ip_cleanup_scheduler.rb | ||
media_cleanup_scheduler.rb | ||
pghero_scheduler.rb | ||
scheduled_statuses_scheduler.rb | ||
trending_tags_scheduler.rb | ||
user_cleanup_scheduler.rb |