mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-25 10:58:06 +01:00
3465d39494
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper_spec.rb | ||
| application_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 | ||