mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 20:28:06 +01:00
bf94a43496
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default. |
||
|---|---|---|
| .. | ||
| about | ||
| accounts | ||
| admin | ||
| admin_mailer | ||
| application | ||
| auth | ||
| authorize_interactions | ||
| directories | ||
| errors | ||
| filters | ||
| follower_accounts | ||
| following_accounts | ||
| home | ||
| invites | ||
| kaminari | ||
| layouts | ||
| media | ||
| notification_mailer | ||
| oauth | ||
| remote_follow | ||
| remote_interaction | ||
| remote_unfollows | ||
| settings | ||
| shared | ||
| shares | ||
| stream_entries | ||
| tags | ||
| user_mailer | ||
| well_known | ||