Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes. - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper. |
||
|---|---|---|
| .. | ||
| 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 | ||