mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-06 08:43:40 +01:00
30ee7339d3
Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| user | ||
| attachmentable.rb | ||
| cacheable.rb | ||
| domain_materializable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| follow_limitable.rb | ||
| lockable.rb | ||
| paginable.rb | ||
| rate_limitable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||