941a9df28a
Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly. |
||
|---|---|---|
| .. | ||
| active_record | ||
| assets | ||
| chewy | ||
| devise | ||
| generators/post_deployment_migration | ||
| json_ld | ||
| linter | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| sanitize_ext | ||
| simple_navigation | ||
| tasks | ||
| templates/haml/scaffold | ||
| terrapin | ||
| webpacker | ||
| exceptions.rb | ||
| http_extensions.rb | ||
| public_file_server_middleware.rb | ||