Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did. |
||
|---|---|---|
| .. | ||
| active_record | ||
| assets | ||
| chewy/strategy | ||
| devise | ||
| generators | ||
| json_ld | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| sanitize_ext | ||
| simple_navigation | ||
| tasks | ||
| templates | ||
| terrapin | ||
| webpacker | ||
| cli.rb | ||
| exceptions.rb | ||