forked from treehouse/mastodon
25a46d9e59
Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies. |
||
|---|---|---|
| .. | ||
| mailer | ||
| alert_badge.png | ||
| clippy_frame.png | ||
| clippy_wave.gif | ||
| elephant_ui_disappointed.svg | ||
| elephant_ui_greeting.svg | ||
| elephant_ui_plane.svg | ||
| elephant_ui_working.svg | ||
| icon_about.png | ||
| icon_blocks.png | ||
| icon_bookmarks.png | ||
| icon_cached.svg | ||
| icon_developers.png | ||
| icon_direct.png | ||
| icon_docs.png | ||
| icon_domain_blocks.png | ||
| icon_done.svg | ||
| icon_email.svg | ||
| icon_file_download.svg | ||
| icon_flag.svg | ||
| icon_follow_requests.png | ||
| icon_grade.svg | ||
| icon_home.png | ||
| icon_invite.png | ||
| icon_keyboard_shortcuts.png | ||
| icon_likes.png | ||
| icon_lists.png | ||
| icon_local.png | ||
| icon_lock_open.svg | ||
| icon_logout.png | ||
| icon_mobile_apps.png | ||
| icon_mutes.png | ||
| icon_notifications.png | ||
| icon_person_add.svg | ||
| icon_pin.png | ||
| icon_profile_directory.png | ||
| icon_public.png | ||
| icon_reply.svg | ||
| icon_settings.png | ||
| icon_tos.png | ||
| logo.svg | ||
| logo_full.svg | ||
| logo_transparent.svg | ||
| logo_transparent_white.svg | ||
| preview.jpg | ||
| reticle.png | ||
| screenshot.jpg | ||
| start.png | ||
| void.png | ||
