ef3d15554b
Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| counters_spec.rb | ||
| finder_concern_spec.rb | ||
| interactions_spec.rb | ||
| statuses_search_spec.rb | ||