mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-16 00:04:04 +01:00
61ef81c548
Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests. |
||
---|---|---|
.. | ||
assets.rake | ||
auto_annotate_models.rake | ||
db.rake | ||
emojis.rake | ||
glitchsoc.rake | ||
mastodon.rake | ||
repo.rake | ||
statistics.rake |