630b245bb4
Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| branding.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| spec.rake | ||
| statistics.rake | ||
| tests.rake | ||
| webpacker.rake | ||