mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-15 18:06:04 +00:00
1b0ff4cd69
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb |
||
---|---|---|
.. | ||
mailer | ||
proof_providers | ||
clippy_frame.png | ||
clippy_wave.gif | ||
elephant-fren.png | ||
elephant_ui_disappointed.svg | ||
elephant_ui_greeting.svg | ||
elephant_ui_plane.svg | ||
elephant_ui_working.svg | ||
icon_about.png | ||
icon_blocks.png | ||
icon_cached.svg | ||
icon_done.svg | ||
icon_email.svg | ||
icon_file_download.svg | ||
icon_flag.svg | ||
icon_follow_requests.png | ||
icon_grade.svg | ||
icon_home.png | ||
icon_keyboard_shortcuts.png | ||
icon_likes.png | ||
icon_lists.png | ||
icon_local.png | ||
icon_lock_open.svg | ||
icon_logout.png | ||
icon_mutes.png | ||
icon_person_add.svg | ||
icon_pin.png | ||
icon_public.png | ||
icon_reply.svg | ||
icon_settings.png | ||
logo.svg | ||
logo_alt.svg | ||
logo_full.svg | ||
logo_transparent.svg | ||
logo_transparent_black.svg | ||
preview.jpg | ||
reticle.png | ||
screen_federation.svg | ||
screen_hello.svg | ||
screen_interactions.svg | ||
screenshot.jpg | ||
start.png | ||
void.png |