diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-05 09:33:44 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-07-05 09:33:44 +0200 |
| commit | 92c06a111397e7f9da44db9942f61fd06e03b557 (patch) | |
| tree | 310b3d0f6c7f161dbcb68aa907bda4562dddd3d8 /app/controllers/api/v1/timelines/public_controller.rb | |
| parent | 7cc76b823ab4dfeca684051a99dba8ea4ce1a8fc (diff) | |
| parent | 44b2ee3485ba0845e5910cefcb4b1e2f84f34470 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.
Diffstat (limited to 'app/controllers/api/v1/timelines/public_controller.rb')
0 files changed, 0 insertions, 0 deletions