mastodon/lib/tasks
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2022-05-01 16:52:27 +02:00
..
assets.rake
auto_annotate_models.rake
db.rake Fix null values being included in some indexes (#17711) 2022-03-12 08:12:57 +01:00
emojis.rake Fix light-mode emoji borders. (#18131) 2022-04-29 19:23:03 +02:00
glitchsoc.rake
mastodon.rake Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338) 2022-01-20 14:51:23 +01:00
repo.rake Remove language detection through cld3 (#17478) 2022-02-08 02:41:17 +01:00
statistics.rake
tests.rake Fix instance actor being incorrectly created when running migrations (#18109) 2022-04-26 21:22:09 +02:00