mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 14:49:01 +09:00
016d194274
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests. |
||
---|---|---|
.. | ||
safe_reblog_insert.rb | ||
search_concern.rb | ||
snapshot_concern.rb | ||
threading_concern.rb |