Claire 69737b703a Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.

2021-05-17 10:30:34 +02: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

Fix typo in db.rake (#16126)

2021-04-27 16:25:24 +02:00

emojis.rake

Add border to 🚲 emoji (#16035)

2021-04-13 23:43:51 +02:00

glitchsoc.rake

…

mastodon.rake

Change mastodon:setup to not call assets:precompile in docker (#13942)

2021-03-24 10:37:24 +01:00

repo.rake

Add more checks to repo:check_locales_files (#16249)

2021-05-16 23:54:46 +02:00

statistics.rake

…