mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 12:00:13 -05:00
8103e69b17
Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper_spec.rb | ||
| application_helper_spec.rb | ||
| database_helper_spec.rb | ||
| flashes_helper_spec.rb | ||
| formatting_helper_spec.rb | ||
| home_helper_spec.rb | ||
| instance_helper_spec.rb | ||
| json_ld_helper_spec.rb | ||
| languages_helper_spec.rb | ||
| media_component_helper_spec.rb | ||
| react_component_helper_spec.rb | ||
| routing_helper_spec.rb | ||
| self_destruct_helper_spec.rb | ||
| settings_helper_spec.rb | ||
| statuses_helper_spec.rb | ||
| theme_helper_spec.rb | ||