mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
|---|---|---|
| .. | ||
| accept.rb | ||
| add.rb | ||
| announce.rb | ||
| block.rb | ||
| create.rb | ||
| delete.rb | ||
| flag.rb | ||
| follow.rb | ||
| like.rb | ||
| move.rb | ||
| reject.rb | ||
| remove.rb | ||
| undo.rb | ||
| update.rb | ||