mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
5e11f3a6e1
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream 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 | ||