mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 06:33:42 +01:00
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. |
||
|---|---|---|
| .. | ||
| accept_spec.rb | ||
| add_spec.rb | ||
| announce_spec.rb | ||
| block_spec.rb | ||
| create_spec.rb | ||
| delete_spec.rb | ||
| flag_spec.rb | ||
| follow_spec.rb | ||
| like_spec.rb | ||
| move_spec.rb | ||
| reject_spec.rb | ||
| remove_spec.rb | ||
| undo_spec.rb | ||
| update_spec.rb | ||