mastodon/lib/tasks
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
..
assets.rake Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
auto_annotate_models.rake Add announcements (#12662) 2020-01-23 22:00:13 +01:00
db.rake
emojis.rake Update emoji codepoint mappings to v11.0 (#9618) 2018-12-24 19:12:00 +01:00
glitchsoc.rake
mastodon.rake Add config of multipart threshold for S3 (#11924) 2019-09-23 15:37:45 +02:00
repo.rake Add missing locale file for ga and add rake task to check for it (#11813) 2019-09-12 04:58:33 +02:00
statistics.rake