9a3d91f629
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| branding.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| statistics.rake | ||
| tests.rake | ||