297eb7c956
Conflicts: - `CONTRIBUTING.md`: Upstream modified it while we quote upstream's within an otherwise different file. Applied upstream's changes. |
||
---|---|---|
.. | ||
annotate_rb.rake | ||
assets.rake | ||
branding.rake | ||
db.rake | ||
emojis.rake | ||
glitchsoc.rake | ||
icons.rake | ||
mastodon.rake | ||
repo.rake | ||
sidekiq_unique_jobs.rake | ||
tests.rake | ||
webpacker.rake |